From: rlfnb <rlfnb@rlfnb.de>
Date: Wed, 26 Apr 2017 22:51:30 +0000 (+0200)
Subject: header cleanup
X-Git-Url: http://zhaoyanbai.com/repos/?a=commitdiff_plain;h=9624407e7addfd8b88486acfe3a0e056e2b92ee3;p=minix.git

header cleanup

Change-Id: I4e169911591c56e91c301c5cb0bb3ea2d8140cf2
---

diff --git a/minix/kernel/arch/i386/acpi.c b/minix/kernel/arch/i386/acpi.c
index 2ab8995db..63ddde12e 100644
--- a/minix/kernel/arch/i386/acpi.c
+++ b/minix/kernel/arch/i386/acpi.c
@@ -1,7 +1,6 @@
 
 #include <string.h>
 
-#include "kernel/kernel.h"
 #include "acpi.h"
 #include "arch_proto.h"
 
diff --git a/minix/kernel/arch/i386/apic.c b/minix/kernel/arch/i386/apic.c
index 4c5ec5d9a..39346b679 100644
--- a/minix/kernel/arch/i386/apic.c
+++ b/minix/kernel/arch/i386/apic.c
@@ -1,7 +1,6 @@
 /*
  * APIC handling routines. APIC is a requirement for SMP
  */
-#include "kernel/kernel.h"
 #include <assert.h>
 
 #include <unistd.h>
@@ -10,8 +9,6 @@
 #include <minix/syslib.h>
 #include <machine/cmos.h>
 
-#include "arch_proto.h"
-
 #include <minix/u64.h>
 
 #include "apic.h"
diff --git a/minix/kernel/arch/i386/arch_clock.c b/minix/kernel/arch/i386/arch_clock.c
index 0dc8d76af..8573e42f7 100644
--- a/minix/kernel/arch/i386/arch_clock.c
+++ b/minix/kernel/arch/i386/arch_clock.c
@@ -1,15 +1,10 @@
 /* i386-specific clock functions. */
 
 #include <machine/ports.h>
-#include <minix/portio.h>
-
-#include "kernel/kernel.h"
 
 #include "kernel/clock.h"
 #include "kernel/interrupt.h"
 #include <minix/u64.h>
-#include "kernel/glo.h"
-#include "kernel/profile.h"
 
 #include <sys/sched.h> /* for CP_*, CPUSTATES */
 #if CPUSTATES != MINIX_CPUSTATES
diff --git a/minix/kernel/arch/i386/arch_do_vmctl.c b/minix/kernel/arch/i386/arch_do_vmctl.c
index 41083487d..159cae70f 100644
--- a/minix/kernel/arch/i386/arch_do_vmctl.c
+++ b/minix/kernel/arch/i386/arch_do_vmctl.c
@@ -9,7 +9,6 @@
 
 #include "kernel/system.h"
 #include <assert.h>
-#include <minix/type.h>
 
 #include "arch_proto.h"
 
diff --git a/minix/kernel/arch/i386/arch_reset.c b/minix/kernel/arch/i386/arch_reset.c
index 4839a1156..5746e383f 100644
--- a/minix/kernel/arch/i386/arch_reset.c
+++ b/minix/kernel/arch/i386/arch_reset.c
@@ -6,7 +6,6 @@
 #include <machine/cmos.h>
 #include <machine/bios.h>
 #include <machine/cpu.h>
-#include <minix/portio.h>
 #include <minix/cpufeature.h>
 #include <sys/reboot.h>
 #include <assert.h>
@@ -14,12 +13,9 @@
 
 #include <minix/u64.h>
 
-#include "archconst.h"
 #include "arch_proto.h"
-#include "serial.h"
 #include "oxpcie.h"
 #include "direct_utils.h"
-#include <machine/multiboot.h>
 
 #ifdef USE_ACPI
 #include "acpi.h"
diff --git a/minix/kernel/arch/i386/arch_smp.c b/minix/kernel/arch/i386/arch_smp.c
index 1b1d0ab9e..8998b8904 100644
--- a/minix/kernel/arch/i386/arch_smp.c
+++ b/minix/kernel/arch/i386/arch_smp.c
@@ -6,17 +6,12 @@
 
 #define _SMP
 
-#include "kernel/kernel.h"
-#include "arch_proto.h"
 #include <unistd.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include <machine/archtypes.h>
-#include <archconst.h>
 #include <machine/cmos.h>
 #include <machine/bios.h>
-#include <minix/portio.h>
 
 #include "kernel/spinlock.h"
 #include "kernel/smp.h"
diff --git a/minix/kernel/arch/i386/arch_system.c b/minix/kernel/arch/i386/arch_system.c
index d8709f7fb..bd75b575e 100644
--- a/minix/kernel/arch/i386/arch_system.c
+++ b/minix/kernel/arch/i386/arch_system.c
@@ -1,7 +1,5 @@
 /* system dependent functions for use inside the whole kernel. */
 
-#include "kernel/kernel.h"
-
 #include <unistd.h>
 #include <ctype.h>
 #include <string.h>
@@ -17,10 +15,7 @@
 #include <minix/u64.h>
 
 #include "archconst.h"
-#include "arch_proto.h"
-#include "serial.h"
 #include "oxpcie.h"
-#include <machine/multiboot.h>
 
 #include "glo.h"
 
diff --git a/minix/kernel/arch/i386/arch_watchdog.c b/minix/kernel/arch/i386/arch_watchdog.c
index 58b76159d..775d487c0 100644
--- a/minix/kernel/arch/i386/arch_watchdog.c
+++ b/minix/kernel/arch/i386/arch_watchdog.c
@@ -1,6 +1,4 @@
-#include "kernel/kernel.h"
 #include "kernel/watchdog.h"
-#include "arch_proto.h"
 #include "glo.h"
 #include <minix/minlib.h>
 #include <minix/u64.h>
diff --git a/minix/kernel/arch/i386/direct_tty_utils.c b/minix/kernel/arch/i386/direct_tty_utils.c
index eb8364bc9..5c577c26d 100644
--- a/minix/kernel/arch/i386/direct_tty_utils.c
+++ b/minix/kernel/arch/i386/direct_tty_utils.c
@@ -1,19 +1,11 @@
 
-#include "kernel/kernel.h"
 #include <minix/minlib.h>
-#include <minix/const.h>
 #include <minix/cpufeature.h>
-#include <minix/type.h>
-#include <minix/com.h>
-#include <sys/types.h>
-#include <sys/param.h>
 #include <machine/partition.h>
 #include "string.h"
-#include "arch_proto.h"
 #include "direct_utils.h"
 #include "serial.h"
 #include "glo.h"
-#include <machine/multiboot.h>
 
 /* Give non-zero values to avoid them in BSS */
 static int print_line = 1, print_col = 1;
diff --git a/minix/kernel/arch/i386/do_iopenable.c b/minix/kernel/arch/i386/do_iopenable.c
index 97a39e7e5..dbb431b85 100644
--- a/minix/kernel/arch/i386/do_iopenable.c
+++ b/minix/kernel/arch/i386/do_iopenable.c
@@ -9,7 +9,6 @@
  */
 
 #include "kernel/system.h"
-#include "kernel/kernel.h"
 #include <minix/endpoint.h>
 
 #include "arch_proto.h"
diff --git a/minix/kernel/arch/i386/do_readbios.c b/minix/kernel/arch/i386/do_readbios.c
index b7ad3c524..4fa05b3d0 100644
--- a/minix/kernel/arch/i386/do_readbios.c
+++ b/minix/kernel/arch/i386/do_readbios.c
@@ -8,7 +8,6 @@
  */
 
 #include "kernel/system.h"
-#include <minix/type.h>
 
 /*===========================================================================*
  *				do_readbios				     *
diff --git a/minix/kernel/arch/i386/i8259.c b/minix/kernel/arch/i386/i8259.c
index 76cf10dac..53327f2a6 100644
--- a/minix/kernel/arch/i386/i8259.c
+++ b/minix/kernel/arch/i386/i8259.c
@@ -8,7 +8,6 @@
 #include "kernel/kernel.h"
 #include "arch_proto.h"
 #include "hw_intr.h"
-#include <minix/portio.h>
 #include <machine/cpu.h>
 
 #define ICW1_AT         0x11	/* edge triggered, cascade, need ICW4 */
diff --git a/minix/kernel/arch/i386/memory.c b/minix/kernel/arch/i386/memory.c
index b81f5939c..8450aa344 100644
--- a/minix/kernel/arch/i386/memory.c
+++ b/minix/kernel/arch/i386/memory.c
@@ -4,7 +4,6 @@
 
 #include <machine/vm.h>
 
-#include <minix/type.h>
 #include <minix/syslib.h>
 #include <minix/cpufeature.h>
 #include <string.h>
diff --git a/minix/kernel/arch/i386/pre_init.c b/minix/kernel/arch/i386/pre_init.c
index 9a0e85dd5..1511bc4d3 100644
--- a/minix/kernel/arch/i386/pre_init.c
+++ b/minix/kernel/arch/i386/pre_init.c
@@ -1,24 +1,16 @@
 
 #define UNPAGED 1	/* for proper kmain() prototype */
 
-#include "kernel/kernel.h"
 #include <assert.h>
 #include <stdlib.h>
 #include <minix/minlib.h>
-#include <minix/const.h>
-#include <minix/type.h>
 #include <minix/board.h>
-#include <minix/com.h>
-#include <sys/types.h>
-#include <sys/param.h>
 #include <sys/reboot.h>
 #include <machine/partition.h>
 #include "string.h"
-#include "arch_proto.h"
 #include "direct_utils.h"
 #include "serial.h"
 #include "glo.h"
-#include <machine/multiboot.h>
 
 #if USE_SYSDEBUG
 #define MULTIBOOT_VERBOSE 1
diff --git a/minix/kernel/arch/i386/protect.c b/minix/kernel/arch/i386/protect.c
index a62b4ee28..ca9a9fd98 100644
--- a/minix/kernel/arch/i386/protect.c
+++ b/minix/kernel/arch/i386/protect.c
@@ -8,10 +8,8 @@
 
 #include <minix/cpufeature.h>
 #include <sys/types.h>
-#include <machine/multiboot.h>
 #include "kernel/kernel.h"
 
-#include "archconst.h"
 #include "arch_proto.h"
 
 #include <sys/exec.h>
diff --git a/minix/kernel/clock.c b/minix/kernel/clock.c
index b4a438efa..3260e60a1 100644
--- a/minix/kernel/clock.c
+++ b/minix/kernel/clock.c
@@ -12,7 +12,6 @@
  *   Sep 24, 2004   redesigned alarm timers  (Jorrit N. Herder)
  */
 
-#include "kernel/kernel.h"
 #include <minix/endpoint.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/minix/kernel/const.h b/minix/kernel/const.h
index be16f21c0..42f849922 100644
--- a/minix/kernel/const.h
+++ b/minix/kernel/const.h
@@ -5,7 +5,6 @@
 #include <minix/config.h>
 #include <minix/bitmap.h>
 
-#include "config.h"
 #include "debug.h"
 
 /* Translate an endpoint number to a process number, return success. */
diff --git a/minix/kernel/debug.c b/minix/kernel/debug.c
index 4463512e6..29f003878 100644
--- a/minix/kernel/debug.c
+++ b/minix/kernel/debug.c
@@ -6,7 +6,6 @@
 #include "kernel/kernel.h"
 
 #include <minix/callnr.h>
-#include <minix/sysutil.h>
 #include <minix/u64.h>
 #include <limits.h>
 #include <string.h>
diff --git a/minix/kernel/interrupt.c b/minix/kernel/interrupt.c
index c828c2c3b..64b447526 100644
--- a/minix/kernel/interrupt.c
+++ b/minix/kernel/interrupt.c
@@ -16,7 +16,6 @@
 #include <assert.h>
 
 #include "kernel/kernel.h"
-#include "archconst.h"
 #include "hw_intr.h"
 
 
diff --git a/minix/kernel/main.c b/minix/kernel/main.c
index 546583a0e..3198aba73 100644
--- a/minix/kernel/main.c
+++ b/minix/kernel/main.c
@@ -8,16 +8,13 @@
  *   main:	    	MINIX main program
  *   prepare_shutdown:	prepare to take MINIX down
  */
-#include "kernel/kernel.h"
 #include <string.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <minix/com.h>
 #include <minix/endpoint.h>
 #include <machine/vmparam.h>
 #include <minix/u64.h>
 #include <minix/board.h>
-#include <minix/type.h>
 #include <sys/reboot.h>
 #include "clock.h"
 #include "direct_utils.h"
diff --git a/minix/kernel/priv.h b/minix/kernel/priv.h
index 4303ac497..66fceffab 100644
--- a/minix/kernel/priv.h
+++ b/minix/kernel/priv.h
@@ -12,7 +12,6 @@
  *   Nov 22, 2009  rewrite of privilege management (Cristiano Giuffrida)
  *   Jul 01, 2005  Created.  (Jorrit N. Herder)	
  */
-#include <minix/com.h>
 #include <minix/const.h>
 #include <minix/priv.h>
 #include "kernel/const.h"
diff --git a/minix/kernel/proc.c b/minix/kernel/proc.c
index 62ef6081c..da74c409b 100644
--- a/minix/kernel/proc.c
+++ b/minix/kernel/proc.c
@@ -29,14 +29,11 @@
  * nonempty lists. As shown above, this is not required with pointer pointers.
  */
 
-#include <minix/com.h>
-#include <minix/ipcconst.h>
 #include <stddef.h>
 #include <signal.h>
 #include <assert.h>
 #include <string.h>
 
-#include "kernel/kernel.h"
 #include "vm.h"
 #include "clock.h"
 #include "spinlock.h"
diff --git a/minix/kernel/profile.c b/minix/kernel/profile.c
index cbb71df06..61d1ee766 100644
--- a/minix/kernel/profile.c
+++ b/minix/kernel/profile.c
@@ -6,13 +6,8 @@
  *   14 Aug, 2006   Created, (Rogier Meurs)
  */
 
-#include <minix/config.h>
-
 #include "kernel/kernel.h"
 
-#include <minix/profile.h>
-#include <minix/portio.h>
-
 #if SPROFILE
 
 #include <string.h>
diff --git a/minix/kernel/system.c b/minix/kernel/system.c
index fbfce305d..01d716c7e 100644
--- a/minix/kernel/system.c
+++ b/minix/kernel/system.c
@@ -32,7 +32,6 @@
  *   Sep 30, 2004   source code documentation updated  (Jorrit N. Herder)
  */
 
-#include "kernel/kernel.h"
 #include "kernel/system.h"
 #include "kernel/vm.h"
 #include "kernel/clock.h"
diff --git a/minix/kernel/system/do_copy.c b/minix/kernel/system/do_copy.c
index fb037368b..3a9c98348 100644
--- a/minix/kernel/system/do_copy.c
+++ b/minix/kernel/system/do_copy.c
@@ -12,7 +12,6 @@
 
 #include "kernel/system.h"
 #include "kernel/vm.h"
-#include <minix/type.h>
 #include <assert.h>
 
 #if (USE_VIRCOPY || USE_PHYSCOPY)
diff --git a/minix/kernel/system/do_devio.c b/minix/kernel/system/do_devio.c
index e55d314c6..7666b65a1 100644
--- a/minix/kernel/system/do_devio.c
+++ b/minix/kernel/system/do_devio.c
@@ -10,7 +10,6 @@
 #include "kernel/system.h"
 #include <minix/devio.h>
 #include <minix/endpoint.h>
-#include <minix/portio.h>
 
 #if USE_DEVIO
 
diff --git a/minix/kernel/system/do_irqctl.c b/minix/kernel/system/do_irqctl.c
index 584b753df..c56bee413 100644
--- a/minix/kernel/system/do_irqctl.c
+++ b/minix/kernel/system/do_irqctl.c
@@ -9,7 +9,6 @@
  *    m_krn_lsys_sys_irqctl.hook_id	(returns index of irq hook assigned at kernel)
  */
 
-#include "kernel/kernel.h"
 #include "kernel/system.h"
 
 #include <minix/endpoint.h>
diff --git a/minix/kernel/system/do_privctl.c b/minix/kernel/system/do_privctl.c
index fc332a82e..74469124b 100644
--- a/minix/kernel/system/do_privctl.c
+++ b/minix/kernel/system/do_privctl.c
@@ -10,7 +10,6 @@
  */
 
 #include "kernel/system.h"
-#include "kernel/ipc.h"
 #include <signal.h>
 #include <string.h>
 #include <minix/endpoint.h>
diff --git a/minix/kernel/system/do_safecopy.c b/minix/kernel/system/do_safecopy.c
index 0990df7e7..83ad0ad4e 100644
--- a/minix/kernel/system/do_safecopy.c
+++ b/minix/kernel/system/do_safecopy.c
@@ -16,7 +16,6 @@
 #include <assert.h>
 
 #include "kernel/system.h"
-#include "kernel/kernel.h"
 #include "kernel/vm.h"
 
 #define MAX_INDIRECT_DEPTH 5	/* up to how many indirect grants to follow? */
diff --git a/minix/kernel/system/do_safememset.c b/minix/kernel/system/do_safememset.c
index 0f9deda38..9b356051a 100644
--- a/minix/kernel/system/do_safememset.c
+++ b/minix/kernel/system/do_safememset.c
@@ -13,7 +13,6 @@
 #include <minix/safecopies.h>
 
 #include "kernel/system.h"
-#include "kernel/kernel.h"
 
 /*===========================================================================*
  *                              do_safememset                                *
diff --git a/minix/kernel/system/do_update.c b/minix/kernel/system/do_update.c
index 34c35f624..68328cb72 100644
--- a/minix/kernel/system/do_update.c
+++ b/minix/kernel/system/do_update.c
@@ -8,7 +8,6 @@
  */
 
 #include "kernel/system.h"
-#include "kernel/ipc.h"
 #include <string.h>
 #include <assert.h>
 
diff --git a/minix/kernel/system/do_vdevio.c b/minix/kernel/system/do_vdevio.c
index d70fde655..6af9b602c 100644
--- a/minix/kernel/system/do_vdevio.c
+++ b/minix/kernel/system/do_vdevio.c
@@ -10,7 +10,6 @@
 #include "kernel/system.h"
 #include <minix/devio.h>
 #include <minix/endpoint.h>
-#include <minix/portio.h>
 
 #if USE_VDEVIO
 
diff --git a/minix/kernel/system/do_vmctl.c b/minix/kernel/system/do_vmctl.c
index 6d33fc98c..5e991990b 100644
--- a/minix/kernel/system/do_vmctl.c
+++ b/minix/kernel/system/do_vmctl.c
@@ -9,9 +9,7 @@
 
 #include "kernel/system.h"
 #include "kernel/vm.h"
-#include "kernel/debug.h"
 #include <assert.h>
-#include <minix/type.h>
 
 /*===========================================================================*
  *				do_vmctl				     *
diff --git a/minix/kernel/table.c b/minix/kernel/table.c
index d52d2fa03..7953d110d 100644
--- a/minix/kernel/table.c
+++ b/minix/kernel/table.c
@@ -30,7 +30,6 @@
 #define _TABLE
 
 #include "kernel/kernel.h"
-#include <minix/com.h>
 
 /* The system image table lists all programs that are part of the boot image. 
  * The order of the entries here MUST agree with the order of the programs
diff --git a/minix/kernel/watchdog.c b/minix/kernel/watchdog.c
index 69e72f159..65bb9ff03 100644
--- a/minix/kernel/watchdog.c
+++ b/minix/kernel/watchdog.c
@@ -6,7 +6,6 @@
 
 #include "watchdog.h"
 #include "arch/i386/glo.h"
-#include "profile.h"
 
 unsigned watchdog_local_timer_ticks = 0U;
 struct arch_watchdog *watchdog;