Kernel: clean up include statements a bit

Coverity was flagging a recursive include between kernel.h and
cpulocals.h. As cpulocals.h also included proc.h, we can move that
include statement into kernel.h, and clean up the source files'
include statements accordingly.

kernel/arch/i386/apic.c

@@ -10,8 +10,6 @@
 #include <minix/syslib.h>
 #include <machine/cmos.h>
 
-#include "kernel/proc.h"
-#include "kernel/glo.h"
 #include "arch_proto.h"
 
 #include <minix/u64.h>

kernel/arch/i386/arch_clock.c

@@ -7,7 +7,6 @@
 #include "kernel/kernel.h"
 
 #include "kernel/clock.h"
-#include "kernel/proc.h"
 #include "kernel/interrupt.h"
 #include <minix/u64.h>
 #include "glo.h"

kernel/arch/i386/arch_reset.c

@@ -19,8 +19,6 @@
 #include "arch_proto.h"
 #include "serial.h"
 #include "oxpcie.h"
-#include "kernel/proc.h"
-#include "kernel/debug.h"
 #include "direct_utils.h"
 #include <machine/multiboot.h>
 

kernel/arch/i386/arch_smp.c

@@ -7,9 +7,7 @@
 #define _SMP
 
 #include "kernel/kernel.h"
-#include "kernel/proc.h"
 #include "arch_proto.h"
-#include "kernel/glo.h"
 #include <unistd.h>
 #include <assert.h>
 #include <stdlib.h>

kernel/arch/i386/arch_system.c

@@ -19,8 +19,6 @@
 #include "arch_proto.h"
 #include "serial.h"
 #include "oxpcie.h"
-#include "kernel/proc.h"
-#include "kernel/debug.h"
 #include "direct_utils.h"
 #include <machine/multiboot.h>
 

kernel/arch/i386/exception.c

@@ -8,8 +8,6 @@
 #include <signal.h>
 #include <string.h>
 #include <assert.h>
-#include "kernel/proc.h"
-#include "kernel/proto.h"
 #include <machine/vm.h>
 
 struct ex_s {

kernel/arch/i386/head.S

@@ -10,8 +10,6 @@
 #include <machine/asm.h>
 #include <machine/interrupt.h>
 #include "archconst.h"
-#include "kernel/const.h"
-#include "kernel/proc.h"
 #include "sconst.h"
 #include <machine/multiboot.h>
 

kernel/arch/i386/i8259.c

@@ -6,7 +6,6 @@
  */
 
 #include "kernel/kernel.h"
-#include "kernel/proc.h"
 #include "arch_proto.h"
 #include "hw_intr.h"
 #include <minix/portio.h>

kernel/arch/i386/memory.c

@@ -1,6 +1,5 @@
 
 #include "kernel/kernel.h"
-#include "kernel/proc.h"
 #include "kernel/vm.h"
 
 #include <machine/vm.h>
@@ -17,8 +16,6 @@
 
 #include "oxpcie.h"
 #include "arch_proto.h"
-#include "kernel/proto.h"
-#include "kernel/debug.h"
 
 #ifdef USE_APIC
 #include "apic.h"

kernel/arch/i386/procoffsets.cf

@@ -1,6 +1,5 @@
 
 include "kernel.h"
-include "proc.h"
 
 struct proc
 member DIREG p_reg.di

kernel/arch/i386/protect.c

@@ -8,7 +8,6 @@
 #include <machine/multiboot.h>
 
 #include "kernel/kernel.h"
-#include "kernel/proc.h"
 #include "archconst.h"
 
 #include "arch_proto.h"

kernel/clock.c

@@ -30,7 +30,6 @@
  */
 
 #include "kernel.h"
-#include "proc.h"
 #include <minix/endpoint.h>
 #include <assert.h>
 

kernel/cpulocals.h

@@ -4,9 +4,6 @@
 
 #ifndef __ASSEMBLY__
 
-#include "kernel.h"
-#include "proc.h"
-
 #ifdef CONFIG_SMP
 
 /* SMP */

kernel/debug.c

@@ -4,8 +4,6 @@
  */
 
 #include "kernel.h"
-#include "proc.h"
-#include "debug.h"
 
 #include <minix/callnr.h>
 #include <minix/sysutil.h>

kernel/interrupt.c

@@ -16,7 +16,6 @@
 #include <assert.h>
 
 #include "kernel.h"
-#include "proc.h"
 #include "archconst.h"
 #include "hw_intr.h"
 

kernel/kernel.h

@@ -45,8 +45,9 @@
 #include "ipc.h"		/* IPC constants */
 #include "profile.h"		/* system profiling */
 #include "perf.h"		/* performance-related definitions */
+#include "proc.h"		/* process table */
+#include "cpulocals.h"		/* CPU-local variables */
 #include "debug.h"		/* debugging, MUST be last kernel header */
-#include "cpulocals.h"
 
 #ifndef CONFIG_SMP
 /* We only support 1 cpu now */

kernel/main.c

@@ -20,8 +20,6 @@
 #include <machine/vmparam.h>
 #include <minix/u64.h>
 #include <minix/type.h>
-#include "proc.h"
-#include "debug.h"
 #include "clock.h"
 #include "hw_intr.h"
 #include "arch_proto.h"

kernel/proc.c

@@ -35,14 +35,10 @@
 #include <signal.h>
 #include <assert.h>
 
-#include "debug.h"
 #include "kernel.h"
-#include "proc.h"
 #include "vm.h"
 #include "clock.h"
 #include "spinlock.h"
-#include "profile.h"
-
 #include "arch_proto.h"
 
 #include <minix/syslib.h>

kernel/profile.c

@@ -18,8 +18,6 @@
 #include <minix/config.h>
 
 #include "kernel.h"
-#include "profile.h"
-#include "proc.h"
 
 #include <minix/profile.h>
 #include <minix/portio.h>

kernel/system.c

@@ -31,10 +31,8 @@
  *   Sep 30, 2004   source code documentation updated  (Jorrit N. Herder)
  */
 
-#include "debug.h"
 #include "kernel.h"
 #include "system.h"
-#include "proc.h"
 #include "vm.h"
 #include "kernel/clock.h"
 #include <stdlib.h>

kernel/system.h

@@ -30,11 +30,7 @@
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
-/* Common includes for the system library. */
-#include "debug.h"
 #include "kernel.h"
-#include "proto.h"
-#include "proc.h"
 
 int do_exec(struct proc * caller, message *m_ptr);
 #if ! USE_EXEC

kernel/table.c

@@ -30,8 +30,6 @@
 #define _TABLE
 
 #include "kernel.h"
-#include "proc.h"
-#include "ipc.h"
 #include <minix/com.h>
 
 /* The system image table lists all programs that are part of the boot image. 

kernel/utility.c

@@ -4,7 +4,6 @@
  */
 
 #include "kernel.h"
-#include "proc.h"
 #include "arch_proto.h"
 
 #include <minix/syslib.h>