[haiku-commits] r37259 - in haiku/trunk: headers/private/kernel headers/private/kernel/arch src/add-ons/kernel/file_systems/packagefs src/system/kernel src/system/kernel/arch/ppc ...

  • From: ingo_weinhold@xxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 26 Jun 2010 00:16:11 +0200 (CEST)

Author: bonefish
Date: 2010-06-26 00:16:10 +0200 (Sat, 26 Jun 2010)
New Revision: 37259
Changeset: http://dev.haiku-os.org/changeset/37259/haiku

Modified:
   haiku/trunk/headers/private/kernel/arch/cpu.h
   haiku/trunk/headers/private/kernel/arch/int.h
   haiku/trunk/headers/private/kernel/cpu.h
   haiku/trunk/headers/private/kernel/int.h
   haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
   haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.h
   haiku/trunk/src/system/kernel/arch/ppc/arch_real_time_clock.cpp
   haiku/trunk/src/system/kernel/arch/x86/arch_debug.cpp
   haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
   haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
   haiku/trunk/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp
   haiku/trunk/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp
   haiku/trunk/src/system/kernel/debug/debug.cpp
   haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp
   haiku/trunk/src/system/kernel/elf.cpp
   haiku/trunk/src/system/kernel/module.cpp
   haiku/trunk/src/system/kernel/smp.cpp
   haiku/trunk/src/tools/gensyscalls/gensyscalls.cpp
Log:
Removed unnecessary inclusions of <boot/kernel_args.h> in private kernel
headers and respectively added includes in source files.


Modified: haiku/trunk/headers/private/kernel/arch/cpu.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/cpu.h       2010-06-25 20:20:59 UTC 
(rev 37258)
+++ haiku/trunk/headers/private/kernel/arch/cpu.h       2010-06-25 22:16:10 UTC 
(rev 37259)
@@ -10,20 +10,23 @@
 
 
 #include <OS.h>
-#include <boot/kernel_args.h>
 
 
 #define PAGE_ALIGN(x) (((x) + (B_PAGE_SIZE - 1)) & ~(B_PAGE_SIZE - 1))
 
+
+struct kernel_args;
+
+
 #ifdef __cplusplus
 extern "C" {
-#endif 
+#endif
 
-status_t arch_cpu_preboot_init_percpu(kernel_args *args, int curr_cpu);
-status_t arch_cpu_init(kernel_args *args);
-status_t arch_cpu_init_percpu(kernel_args *args, int curr_cpu);
-status_t arch_cpu_init_post_vm(kernel_args *args);
-status_t arch_cpu_init_post_modules(kernel_args *args);
+status_t arch_cpu_preboot_init_percpu(struct kernel_args *args, int curr_cpu);
+status_t arch_cpu_init(struct kernel_args *args);
+status_t arch_cpu_init_percpu(struct kernel_args *args, int curr_cpu);
+status_t arch_cpu_init_post_vm(struct kernel_args *args);
+status_t arch_cpu_init_post_modules(struct kernel_args *args);
 status_t arch_cpu_shutdown(bool reboot);
 
 void arch_cpu_invalidate_TLB_range(addr_t start, addr_t end);
@@ -47,7 +50,7 @@
 
 #ifdef __cplusplus
 }
-#endif 
+#endif
 
 #include <arch_cpu.h>
 

Modified: haiku/trunk/headers/private/kernel/arch/int.h
===================================================================
--- haiku/trunk/headers/private/kernel/arch/int.h       2010-06-25 20:20:59 UTC 
(rev 37258)
+++ haiku/trunk/headers/private/kernel/arch/int.h       2010-06-25 22:16:10 UTC 
(rev 37259)
@@ -24,7 +24,7 @@
 
 status_t arch_int_init(struct kernel_args* args);
 status_t arch_int_init_post_vm(struct kernel_args* args);
-status_t arch_int_init_io(kernel_args* args);
+status_t arch_int_init_io(struct kernel_args* args);
 status_t arch_int_init_post_device_manager(struct kernel_args* args);
 
 void arch_int_enable_interrupts(void);

Modified: haiku/trunk/headers/private/kernel/cpu.h
===================================================================
--- haiku/trunk/headers/private/kernel/cpu.h    2010-06-25 20:20:59 UTC (rev 
37258)
+++ haiku/trunk/headers/private/kernel/cpu.h    2010-06-25 22:16:10 UTC (rev 
37259)
@@ -13,7 +13,6 @@
 
 #include <smp.h>
 #include <timer.h>
-#include <boot/kernel_args.h>
 #include <arch/cpu.h>
 
 
@@ -23,6 +22,7 @@
 #endif
 
 
+struct kernel_args;
 struct thread;
 
 
@@ -55,7 +55,8 @@
 } cpu_ent __attribute__((aligned(64)));
 
 
-extern cpu_ent gCPU[MAX_BOOT_CPUS];
+//extern cpu_ent gCPU[MAX_BOOT_CPUS];
+extern cpu_ent gCPU[];
 
 
 #ifdef __cplusplus
@@ -64,7 +65,7 @@
 
 status_t cpu_preboot_init_percpu(struct kernel_args *args, int curr_cpu);
 status_t cpu_init(struct kernel_args *args);
-status_t cpu_init_percpu(kernel_args *ka, int curr_cpu);
+status_t cpu_init_percpu(struct kernel_args *ka, int curr_cpu);
 status_t cpu_init_post_vm(struct kernel_args *args);
 status_t cpu_init_post_modules(struct kernel_args *args);
 bigtime_t cpu_get_active_time(int32 cpu);

Modified: haiku/trunk/headers/private/kernel/int.h
===================================================================
--- haiku/trunk/headers/private/kernel/int.h    2010-06-25 20:20:59 UTC (rev 
37258)
+++ haiku/trunk/headers/private/kernel/int.h    2010-06-25 22:16:10 UTC (rev 
37259)
@@ -25,7 +25,7 @@
 
 status_t int_init(struct kernel_args* args);
 status_t int_init_post_vm(struct kernel_args* args);
-status_t int_init_io(kernel_args* args);
+status_t int_init_io(struct kernel_args* args);
 status_t int_init_post_device_manager(struct kernel_args* args);
 int int_io_interrupt_handler(int vector, bool levelTriggered);
 

Modified: haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.cpp    
2010-06-25 20:20:59 UTC (rev 37258)
+++ haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.cpp    
2010-06-25 22:16:10 UTC (rev 37259)
@@ -21,7 +21,6 @@
 #include <AutoDeleter.h>
 
 #include <Notifications.h>
-#include <util/KMessage.h>
 
 #include "ErrorOutput.h"
 #include "FDCloser.h"

Modified: haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.h
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.h      
2010-06-25 20:20:59 UTC (rev 37258)
+++ haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.h      
2010-06-25 22:16:10 UTC (rev 37259)
@@ -12,6 +12,7 @@
 #include <lock.h>
 #include <util/AutoLock.h>
 #include <util/DoublyLinkedList.h>
+#include <util/KMessage.h>
 
 #include "Node.h"
 #include "PackageDomain.h"

Modified: haiku/trunk/src/system/kernel/arch/ppc/arch_real_time_clock.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/ppc/arch_real_time_clock.cpp     
2010-06-25 20:20:59 UTC (rev 37258)
+++ haiku/trunk/src/system/kernel/arch/ppc/arch_real_time_clock.cpp     
2010-06-25 22:16:10 UTC (rev 37259)
@@ -6,6 +6,7 @@
 #include <arch/real_time_clock.h>
 
 #include <arch_platform.h>
+#include <boot/kernel_args.h>
 #include <real_time_data.h>
 #include <smp.h>
 

Modified: haiku/trunk/src/system/kernel/arch/x86/arch_debug.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_debug.cpp       2010-06-25 
20:20:59 UTC (rev 37258)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_debug.cpp       2010-06-25 
22:16:10 UTC (rev 37259)
@@ -13,6 +13,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <TypeConstants.h>
+
 #include <cpu.h>
 #include <debug.h>
 #include <debug_heap.h>

Modified: haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp  2010-06-25 20:20:59 UTC 
(rev 37258)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_vm.cpp  2010-06-25 22:16:10 UTC 
(rev 37259)
@@ -17,6 +17,7 @@
 
 #include <KernelExport.h>
 
+#include <boot/kernel_args.h>
 #include <smp.h>
 #include <util/AutoLock.h>
 #include <vm/vm.h>

Modified: haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp  
2010-06-25 20:20:59 UTC (rev 37258)
+++ haiku/trunk/src/system/kernel/arch/x86/arch_vm_translation_map.cpp  
2010-06-25 22:16:10 UTC (rev 37259)
@@ -10,6 +10,8 @@
 
 #include <arch/vm_translation_map.h>
 
+#include <boot/kernel_args.h>
+
 #include "paging/32bit/X86PagingMethod32Bit.h"
 #include "paging/pae/X86PagingMethodPAE.h"
 

Modified: 
haiku/trunk/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp
===================================================================
--- 
haiku/trunk/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp    
    2010-06-25 20:20:59 UTC (rev 37258)
+++ 
haiku/trunk/src/system/kernel/arch/x86/paging/32bit/X86PagingMethod32Bit.cpp    
    2010-06-25 22:16:10 UTC (rev 37259)
@@ -16,6 +16,7 @@
 #include <AutoDeleter.h>
 
 #include <arch_system_info.h>
+#include <boot/kernel_args.h>
 #include <int.h>
 #include <thread.h>
 #include <vm/vm.h>

Modified: 
haiku/trunk/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp
===================================================================
--- haiku/trunk/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp    
2010-06-25 20:20:59 UTC (rev 37258)
+++ haiku/trunk/src/system/kernel/arch/x86/paging/pae/X86PagingMethodPAE.cpp    
2010-06-25 22:16:10 UTC (rev 37259)
@@ -15,6 +15,7 @@
 
 #include <AutoDeleter.h>
 
+#include <boot/kernel_args.h>
 #include <util/AutoLock.h>
 #include <vm/vm.h>
 #include <vm/vm_page.h>

Modified: haiku/trunk/src/system/kernel/debug/debug.cpp
===================================================================
--- haiku/trunk/src/system/kernel/debug/debug.cpp       2010-06-25 20:20:59 UTC 
(rev 37258)
+++ haiku/trunk/src/system/kernel/debug/debug.cpp       2010-06-25 22:16:10 UTC 
(rev 37259)
@@ -15,6 +15,7 @@
 
 #include <algorithm>
 
+#include <boot/kernel_args.h>
 #include <cpu.h>
 #include <debug.h>
 #include <debug_heap.h>

Modified: haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp
===================================================================
--- haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp     
2010-06-25 20:20:59 UTC (rev 37258)
+++ haiku/trunk/src/system/kernel/device_manager/legacy_drivers.cpp     
2010-06-25 22:16:10 UTC (rev 37259)
@@ -16,6 +16,7 @@
 #include <NodeMonitor.h>
 
 #include <boot_device.h>
+#include <boot/kernel_args.h>
 #include <elf.h>
 #include <fs/devfs.h>
 #include <fs/KPath.h>
@@ -714,7 +715,7 @@
                                        driver->binary_updated = true;
                                break;
                        }
-                       
+
                        case kRemoveDriver:
                        {
                                // Mark removed drivers as updated

Modified: haiku/trunk/src/system/kernel/elf.cpp
===================================================================
--- haiku/trunk/src/system/kernel/elf.cpp       2010-06-25 20:20:59 UTC (rev 
37258)
+++ haiku/trunk/src/system/kernel/elf.cpp       2010-06-25 22:16:10 UTC (rev 
37259)
@@ -20,6 +20,7 @@
 #include <ctype.h>
 
 #include <AutoDeleter.h>
+#include <boot/kernel_args.h>
 #include <debug.h>
 #include <image_defs.h>
 #include <kernel.h>

Modified: haiku/trunk/src/system/kernel/module.cpp
===================================================================
--- haiku/trunk/src/system/kernel/module.cpp    2010-06-25 20:20:59 UTC (rev 
37258)
+++ haiku/trunk/src/system/kernel/module.cpp    2010-06-25 22:16:10 UTC (rev 
37259)
@@ -22,6 +22,7 @@
 
 #include <boot_device.h>
 #include <boot/elf.h>
+#include <boot/kernel_args.h>
 #include <elf.h>
 #include <fs/KPath.h>
 #include <fs/node_monitor.h>

Modified: haiku/trunk/src/system/kernel/smp.cpp
===================================================================
--- haiku/trunk/src/system/kernel/smp.cpp       2010-06-25 20:20:59 UTC (rev 
37258)
+++ haiku/trunk/src/system/kernel/smp.cpp       2010-06-25 22:16:10 UTC (rev 
37259)
@@ -20,6 +20,7 @@
 #include <arch/debug.h>
 #include <arch/int.h>
 #include <arch/smp.h>
+#include <boot/kernel_args.h>
 #include <cpu.h>
 #include <generic_syscall.h>
 #include <int.h>

Modified: haiku/trunk/src/tools/gensyscalls/gensyscalls.cpp
===================================================================
--- haiku/trunk/src/tools/gensyscalls/gensyscalls.cpp   2010-06-25 20:20:59 UTC 
(rev 37258)
+++ haiku/trunk/src/tools/gensyscalls/gensyscalls.cpp   2010-06-25 22:16:10 UTC 
(rev 37259)
@@ -420,6 +420,10 @@
                file << "#ifndef _ASSEMBLER" << endl;
                file << endl;
 
+               // includes
+               file << "#include <TypeConstants.h>" << endl;
+               file << endl;
+
                // output syscall count
                file << "const int kSyscallCount = SYSCALL_COUNT;" << endl;
                file << endl;


Other related posts: