* Moved the VM headers into subdirectory vm/.

* Renamed vm_cache.h/vm_address_space.h to VMCache.h/VMAddressSpace.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34449 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/kernel/arch/arm/arch_vm.h

@@ -5,7 +5,7 @@
 #ifndef ARCH_ARM_VM_H
 #define ARCH_ARM_VM_H
 
-//#include <vm_translation_map.h>
+//#include <vm/vm_translation_map.h>
 
 /* This many pages will be read/written on I/O if possible */
 
@@ -22,7 +22,7 @@ struct arm_vm_ops {
 	status_t (*arch_vm_translation_map_init)(kernel_args *args);
 	status_t (*arch_vm_translation_map_init_post_area)(kernel_args *args);
 	status_t (*arch_vm_translation_map_init_post_sem)(kernel_args *args);
-	status_t (*arch_vm_translation_map_early_map)(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, 
+	status_t (*arch_vm_translation_map_early_map)(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress,
 		uint8 attributes, addr_t (*get_free_page)(kernel_args *));
 	status_t (*arch_vm_translation_map_early_query)(addr_t va, addr_t *out_physical);*/
 //	void (*m68k_set_pgdir)(void *);

headers/private/kernel/arch/m68k/arch_vm.h

@@ -5,7 +5,7 @@
 #ifndef ARCH_M68K_VM_H
 #define ARCH_M68K_VM_H
 
-#include <vm_translation_map.h>
+#include <vm/vm_translation_map.h>
 
 /* This many pages will be read/written on I/O if possible */
 
@@ -22,7 +22,7 @@ struct m68k_vm_ops {
 	status_t (*arch_vm_translation_map_init)(kernel_args *args);
 	status_t (*arch_vm_translation_map_init_post_area)(kernel_args *args);
 	status_t (*arch_vm_translation_map_init_post_sem)(kernel_args *args);
-	status_t (*arch_vm_translation_map_early_map)(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, 
+	status_t (*arch_vm_translation_map_early_map)(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress,
 		uint8 attributes, addr_t (*get_free_page)(kernel_args *));
 	status_t (*arch_vm_translation_map_early_query)(addr_t va, addr_t *out_physical);
 	void (*m68k_set_pgdir)(void *);

headers/private/kernel/arch/vm_translation_map.h

@@ -9,7 +9,7 @@
 #define KERNEL_ARCH_VM_TRANSLATION_MAP_H
 
 
-#include <vm_translation_map.h>
+#include <vm/vm_translation_map.h>
 
 
 #ifdef __cplusplus

headers/private/kernel/file_cache.h

@@ -7,7 +7,7 @@
 
 
 #include <vfs.h>
-#include <vm_types.h>
+#include <vm/vm_types.h>
 #include <module.h>
 
 

headers/private/kernel/util/syscall_args.h

@@ -4,7 +4,7 @@
 #define _SYSCALL_ARGS_H
 
 #include <kernel.h>
-//#include <vm.h>
+
 
 // Hack to be able to use the IS_USER_ADDRESS macro when compiling for R5.
 #ifdef R5_MEMORY_LAYOUT
@@ -34,4 +34,5 @@ copy_ref_var_to_user(T &kernel, T *user)
 	return user_memcpy(user, &kernel, sizeof(T));
 }
 
+
 #endif	// _SYSCALL_ARGS_H

headers/private/kernel/vm/VMAddressSpace.h

@@ -6,13 +6,13 @@
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
-#ifndef _KERNEL_VM_ADDRESS_SPACE_H
+#ifndef _KERNEL_VM_VM_ADDRESS_SPACE_H
-#define _KERNEL_VM_ADDRESS_SPACE_H
+#define _KERNEL_VM_VM_ADDRESS_SPACE_H
 
 
 #include <OS.h>
 
-#include <vm_translation_map.h>
+#include <vm/vm_translation_map.h>
 
 
 struct VMArea;
@@ -115,4 +115,4 @@ status_t vm_delete_areas(struct VMAddressSpace *aspace);
 #endif
 
 
-#endif	/* _KERNEL_VM_ADDRESS_SPACE_H */
+#endif	/* _KERNEL_VM_VM_ADDRESS_SPACE_H */

headers/private/kernel/vm/VMCache.h

@@ -5,12 +5,12 @@
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
-#ifndef _KERNEL_VM_CACHE_H
+#ifndef _KERNEL_VM_VM_CACHE_H
-#define _KERNEL_VM_CACHE_H
+#define _KERNEL_VM_VM_CACHE_H
 
 
 #include <kernel.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 
 struct kernel_args;
@@ -28,4 +28,4 @@ struct VMCache *vm_cache_acquire_locked_page_cache(struct vm_page *page,
 }
 #endif
 
-#endif	/* _KERNEL_VM_CACHE_H */
+#endif	/* _KERNEL_VM_VM_CACHE_H */

headers/private/kernel/vm/vm.h

@@ -5,8 +5,8 @@
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
-#ifndef _KERNEL_VM_H
+#ifndef _KERNEL_VM_VM_H
-#define _KERNEL_VM_H
+#define _KERNEL_VM_VM_H
 
 #include <OS.h>
 
@@ -154,4 +154,4 @@ status_t _user_unreserve_address_range(addr_t address, addr_t size);
 }
 #endif
 
-#endif	/* _KERNEL_VM_H */
+#endif	/* _KERNEL_VM_VM_H */

headers/private/kernel/vm/vm_page.h

@@ -5,11 +5,11 @@
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
-#ifndef _KERNEL_VM_PAGE_H
+#ifndef _KERNEL_VM_VM_PAGE_H
-#define _KERNEL_VM_PAGE_H
+#define _KERNEL_VM_VM_PAGE_H
 
 
-#include <vm.h>
+#include <vm/vm.h>
 
 
 struct kernel_args;
@@ -62,4 +62,4 @@ struct vm_page *vm_lookup_page(addr_t pageNumber);
 }
 #endif
 
-#endif	/* _KERNEL_VM_PAGE_H */
+#endif	/* _KERNEL_VM_VM_PAGE_H */

headers/private/kernel/vm/vm_priv.h

@@ -5,11 +5,11 @@
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
-#ifndef _KERNEL_VM_PRIV_H
+#ifndef _KERNEL_VM_VM_PRIV_H
-#define _KERNEL_VM_PRIV_H
+#define _KERNEL_VM_VM_PRIV_H
 
 
-#include <vm_types.h>
+#include <vm/vm_types.h>
 
 
 // reserved area definitions
@@ -41,5 +41,4 @@ const char *page_state_to_string(int state);
 }
 #endif
 
-#endif	/* _KERNEL_VM_PRIV_H */
+#endif	/* _KERNEL_VM_VM_PRIV_H */
-

headers/private/kernel/vm/vm_translation_map.h

@@ -5,8 +5,8 @@
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
-#ifndef KERNEL_VM_TRANSLATION_MAP_H
+#ifndef KERNEL_VM_VM_TRANSLATION_MAP_H
-#define KERNEL_VM_TRANSLATION_MAP_H
+#define KERNEL_VM_VM_TRANSLATION_MAP_H
 
 
 #include <kernel.h>
@@ -73,4 +73,4 @@ typedef struct vm_translation_map_ops {
 
 #include <arch/vm_translation_map.h>
 
-#endif	/* KERNEL_VM_TRANSLATION_MAP_H */
+#endif	/* KERNEL_VM_VM_TRANSLATION_MAP_H */

headers/private/kernel/vm/vm_types.h

@@ -6,8 +6,8 @@
  * Copyright 2001-2002, Travis Geiselbrecht. All rights reserved.
  * Distributed under the terms of the NewOS License.
  */
-#ifndef _KERNEL_VM_TYPES_H
+#ifndef _KERNEL_VM_VM_TYPES_H
-#define _KERNEL_VM_TYPES_H
+#define _KERNEL_VM_VM_TYPES_H
 
 
 #include <arch/vm_types.h>
@@ -314,4 +314,4 @@ struct VMArea {
 };
 
 
-#endif	// _KERNEL_VM_TYPES_H
+#endif	// _KERNEL_VM_VM_TYPES_H

src/add-ons/kernel/bus_managers/acpi/oshaiku.c

@@ -130,7 +130,7 @@
 
 #include <dpc.h>
 #include <PCI.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 
 extern pci_module_info *gPCIManager;

src/add-ons/kernel/bus_managers/agp_gart/agp_gart.cpp

@@ -33,8 +33,8 @@
 #include <util/OpenHashTable.h>
 #ifdef __HAIKU__
 #	include <kernel/lock.h>
-#	include <vm_page.h>
+#	include <vm/vm_page.h>
-#	include <vm_types.h>
+#	include <vm/vm_types.h>
 #endif
 
 #include <lock.h>

src/add-ons/kernel/bus_managers/ata/ATAChannel.cpp

@@ -129,17 +129,17 @@ ATAChannel::_DevicePresent(int device)
 	ata_task_file taskFile;
 	taskFile.chs.sector_count = 0x5a;
 	taskFile.chs.sector_number = 0xa5;
-	if (_WriteRegs(&taskFile, ATA_MASK_SECTOR_COUNT 
+	if (_WriteRegs(&taskFile, ATA_MASK_SECTOR_COUNT
 		| ATA_MASK_SECTOR_NUMBER) != B_OK) {
 		TRACE_ERROR("_DevicePresent: writing registers failed\n");
 		return false;
 	}
-	if (_ReadRegs(&taskFile, ATA_MASK_SECTOR_COUNT 
+	if (_ReadRegs(&taskFile, ATA_MASK_SECTOR_COUNT
 		| ATA_MASK_SECTOR_NUMBER) != B_OK) {
 		TRACE_ERROR("_DevicePresent: reading registers failed\n");
 		return false;
 	}
-	bool present = (taskFile.chs.sector_count == 0x5a && 
+	bool present = (taskFile.chs.sector_count == 0x5a &&
 		taskFile.chs.sector_number == 0xa5);
 
 	TRACE_ALWAYS("_DevicePresent: device %i, presence %d\n", device, present);
@@ -179,7 +179,7 @@ ATAChannel::ScanBus()
 		if (Wait(0, ATA_STATUS_BUSY, 0, 3 * 1000 * 1000) != B_OK) {
 			uint8 status = AltStatus();
 			if (status == 0xff || status == 0x7f) {
-				TRACE_ALWAYS("illegal status value 0x%02x for device %d\n", 
+				TRACE_ALWAYS("illegal status value 0x%02x for device %d\n",
 					status, i);
 				continue;
 			} else {
@@ -214,7 +214,7 @@ ATAChannel::ScanBus()
 			TRACE_ERROR("device 0 indicates that device 1 failed"
 				" error code is 0x%02x\n", taskFile.read.error);
 		} else if (taskFile.read.error != 0x01) {
-			TRACE_ERROR("device %d failed, error code is 0x%02x\n", 
+			TRACE_ERROR("device %d failed, error code is 0x%02x\n",
 				i, taskFile.read.error);
 		}
 
@@ -455,7 +455,7 @@ ATAChannel::Wait(uint8 setBits, uint8 clearedBits, uint32 flags,
 		bigtime_t elapsedTime = system_time() - startTime;
 #if ATA_TRACING
 		if (lastStatus != status) {
-			TRACE("wait status changed after %lld, status 0x%02x\n", 
+			TRACE("wait status changed after %lld, status 0x%02x\n",
 				elapsedTime, status);
 			lastStatus = status;
 		}
@@ -990,7 +990,7 @@ ATAChannel::_TransferPIOBlock(ATARequest *request, size_t length,
 
 
 // TODO: this should not be necessary, we could directly use virtual addresses
-#include <vm.h>
+#include <vm/vm.h>
 #include <thread.h>
 
 status_t

src/add-ons/kernel/bus_managers/ata/ATAHelper.cpp

@@ -8,7 +8,7 @@
 
 #include "ATAPrivate.h"
 
-#include <vm.h>
+#include <vm/vm.h>
 #include <string.h>
 
 

src/add-ons/kernel/bus_managers/ide/emulation.c

@@ -11,7 +11,7 @@
 #include "ide_internal.h"
 #include "ide_sim.h"
 
-#include <vm.h>
+#include <vm/vm.h>
 
 #include <string.h>
 

src/add-ons/kernel/bus_managers/ide/pio.c

@@ -40,7 +40,7 @@
 #include "ide_sim.h"
 
 #include <thread.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 #include <string.h>
 

src/add-ons/kernel/bus_managers/scsi/dma_buffer.c

@@ -27,7 +27,7 @@
 #include "scsi_internal.h"
 #include "KernelExport_ext.h"
 
-#include <vm.h>
+#include <vm/vm.h>
 
 #include <string.h>
 

src/add-ons/kernel/bus_managers/scsi/emulation.c

@@ -15,7 +15,7 @@
 
 #include "scsi_internal.h"
 
-#include <vm.h>
+#include <vm/vm.h>
 
 #include <string.h>
 

src/add-ons/kernel/busses/scsi/ahci/util.c

@@ -6,7 +6,7 @@
 
 #include <KernelExport.h>
 #include <OS.h>
-#include <vm.h>
+#include <vm/vm.h>
 #include <string.h>
 
 

src/add-ons/kernel/drivers/graphics/vesa/vesa.cpp

@@ -13,7 +13,7 @@
 #include <frame_buffer_console.h>
 #include <util/kernel_cpp.h>
 #include <arch/x86/vm86.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 #include "driver.h"
 #include "utility.h"

src/system/kernel/arch/arm/arch_debug_console.cpp

@@ -14,7 +14,7 @@
 #include <arch/debug_console.h>
 #include <boot/kernel_args.h>
 #include <kernel.h>
-#include <vm.h>
+#include <vm/vm.h>
 #include <arch/arm/uart.h>
 #include <string.h>
 

src/system/kernel/arch/arm/arch_int.cpp

@@ -26,9 +26,9 @@
 #include <timer.h>
 #include <util/DoublyLinkedList.h>
 #include <util/kernel_cpp.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 #include <string.h>
 
 #warning M68K: writeme!
@@ -69,7 +69,7 @@ struct iframe_stack gBootFrameStack;
 //static void *sPICCookie;
 
 
-void 
+void
 arch_int_enable_io_interrupt(int irq)
 {
 #warning ARM WRITEME
@@ -82,7 +82,7 @@ arch_int_enable_io_interrupt(int irq)
 }
 
 
-void 
+void
 arch_int_disable_io_interrupt(int irq)
 {
 #warning ARM WRITEME
@@ -98,7 +98,7 @@ arch_int_disable_io_interrupt(int irq)
 /* arch_int_*_interrupts() and friends are in arch_asm.S */
 
 
-static void 
+static void
 print_iframe(struct iframe *frame)
 {
 /*
@@ -112,7 +112,7 @@ print_iframe(struct iframe *frame)
 #warning ARM WRITEME
 }
 
-status_t 
+status_t
 arch_int_init(kernel_args *args)
 {
 	status_t err;
@@ -129,7 +129,7 @@ arch_int_init(kernel_args *args)
 	/* point VBR to the new table */
 //	asm volatile  ("movec %0,%%vbr" : : "r"(vbr):);
 #warning ARM WRITEME
-	
+
 	return B_OK;
 }
 

src/system/kernel/arch/arm/arch_thread.cpp

@@ -18,8 +18,8 @@
 #include <boot/stage2.h>
 #include <kernel.h>
 #include <thread.h>
-#include <vm_address_space.h>
+#include <vm/vm_types.h>
-#include <vm_types.h>
+#include <vm/VMAddressSpace.h>
 #include <arch_vm.h>
 //#include <arch/vm_translation_map.h>
 

src/system/kernel/arch/arm/arch_vm.cpp

@@ -14,8 +14,8 @@
 #include <kernel.h>
 #include <boot/kernel_args.h>
 
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_types.h>
+#include <vm/vm_types.h>
 #include <arch/vm.h>
 //#include <arch_mmu.h>
 

src/system/kernel/arch/arm/arch_vm_translation_map.cpp

@@ -11,9 +11,9 @@
 
 #include <KernelExport.h>
 #include <kernel.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 #include <int.h>
 #include <boot/kernel_args.h>
 #include <arch/vm_translation_map.h>
@@ -94,7 +94,7 @@ arch_vm_translation_map_init_post_sem(kernel_args *args)
  */
 
 status_t
-arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, 
+arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress,
 	uint8 attributes, addr_t (*get_free_page)(kernel_args *))
 {
 	return NULL;
@@ -107,7 +107,7 @@ arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t
 
 // XXX currently assumes this translation map is active
 
-status_t 
+status_t
 arch_vm_translation_map_early_query(addr_t va, addr_t *out_physical)
 {
 	return NULL;

src/system/kernel/arch/generic/generic_vm_physical_page_mapper.cpp

@@ -9,9 +9,9 @@
 
 #include "generic_vm_physical_page_mapper.h"
 
-#include <vm_address_space.h>
+#include <vm/vm_page.h>
-#include <vm_page.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 #include <thread.h>
 #include <util/queue.h>
 

src/system/kernel/arch/generic/generic_vm_physical_page_ops.cpp

@@ -5,7 +5,7 @@
 
 #include "generic_vm_physical_page_ops.h"
 
-#include <vm.h>
+#include <vm/vm.h>
 #include <util/AutoLock.h>
 
 

src/system/kernel/arch/m68k/arch_debug_console.cpp

@@ -14,7 +14,7 @@
 #include <arch/debug_console.h>
 #include <boot/kernel_args.h>
 #include <kernel.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 #include <string.h>
 

src/system/kernel/arch/m68k/arch_int.cpp

@@ -26,9 +26,9 @@
 #include <timer.h>
 #include <util/DoublyLinkedList.h>
 #include <util/kernel_cpp.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 #include <string.h>
 
 #warning M68K: writeme!

src/system/kernel/arch/m68k/arch_thread.cpp

@@ -18,8 +18,8 @@
 #include <boot/stage2.h>
 #include <kernel.h>
 #include <thread.h>
-#include <vm_address_space.h>
+#include <vm/vm_types.h>
-#include <vm_types.h>
+#include <vm/VMAddressSpace.h>
 #include <arch_vm.h>
 //#include <arch/vm_translation_map.h>
 

src/system/kernel/arch/m68k/arch_vm.cpp

@@ -14,8 +14,8 @@
 #include <kernel.h>
 #include <boot/kernel_args.h>
 
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_types.h>
+#include <vm/vm_types.h>
 #include <arch/vm.h>
 #include <arch_mmu.h>
 

src/system/kernel/arch/m68k/arch_vm_translation_map.cpp

@@ -11,9 +11,9 @@
 
 #include <KernelExport.h>
 #include <kernel.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 #include <int.h>
 #include <boot/kernel_args.h>
 #include <arch/vm_translation_map.h>
@@ -112,7 +112,7 @@ arch_vm_translation_map_init_post_sem(kernel_args *args)
  */
 
 status_t
-arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress, 
+arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t physicalAddress,
 	uint8 attributes, addr_t (*get_free_page)(kernel_args *))
 {
 	return get_vm_ops()->arch_vm_translation_map_early_map(ka, virtualAddress, physicalAddress,
@@ -122,7 +122,7 @@ arch_vm_translation_map_early_map(kernel_args *ka, addr_t virtualAddress, addr_t
 
 // XXX currently assumes this translation map is active
 
-status_t 
+status_t
 arch_vm_translation_map_early_query(addr_t va, addr_t *out_physical)
 {
 	return get_vm_ops()->arch_vm_translation_map_early_query(va, out_physical);

src/system/kernel/arch/m68k/arch_vm_translation_map_impl.cpp

@@ -43,10 +43,10 @@
 #include <KernelExport.h>
 #include <kernel.h>
 #include <heap.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_page.h>
-#include <vm_page.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 #include <int.h>
 #include <boot/kernel_args.h>
 #include <arch/vm_translation_map.h>

src/system/kernel/arch/mipsel/arch_debug_console.cpp

@@ -12,7 +12,7 @@
 #include <arch/debug_console.h>
 #include <boot/kernel_args.h>
 #include <kernel.h>
-#include <vm.h>
+#include <vm/vm.h>
 #include <arch/arm/uart.h>
 #include <string.h>
 

src/system/kernel/arch/mipsel/arch_int.cpp

@@ -24,9 +24,9 @@
 #include <timer.h>
 #include <util/DoublyLinkedList.h>
 #include <util/kernel_cpp.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 #include <string.h>
 
 
@@ -42,28 +42,28 @@ addr_t gFaultHandler;
 struct iframe_stack gBootFrameStack;
 
 
-void 
+void
 arch_int_enable_io_interrupt(int irq)
 {
 #warning IMPLEMENT arch_int_enable_io_interrupt
 }
 
 
-void 
+void
 arch_int_disable_io_interrupt(int irq)
 {
 #warning IMPLEMENT arch_int_disable_io_interrupt
 }
 
 
-static void 
+static void
 print_iframe(struct iframe* frame)
 {
 #warning IMPLEMENT print_iframe
 }
 
 
-status_t 
+status_t
 arch_int_init(kernel_args* args)
 {
 #warning IMPLEMENT arch_int_init

src/system/kernel/arch/mipsel/arch_thread.cpp

@@ -19,8 +19,8 @@
 #include <boot/stage2.h>
 #include <kernel.h>
 #include <thread.h>
-#include <vm_address_space.h>
+#include <vm/vm_types.h>
-#include <vm_types.h>
+#include <vm/VMAddressSpace.h>
 #include <arch_vm.h>
 
 #include <string.h>

src/system/kernel/arch/mipsel/arch_vm.cpp

@@ -13,8 +13,8 @@
 #include <kernel.h>
 #include <boot/kernel_args.h>
 
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_types.h>
+#include <vm/vm_types.h>
 #include <arch/vm.h>
 
 

src/system/kernel/arch/mipsel/arch_vm_translation_map.cpp

@@ -10,9 +10,9 @@
 
 #include <KernelExport.h>
 #include <kernel.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 #include <int.h>
 #include <boot/kernel_args.h>
 #include <arch/vm_translation_map.h>
@@ -76,7 +76,7 @@ arch_vm_translation_map_early_map(kernel_args* ka, addr_t virtualAddress,
 }
 
 
-status_t 
+status_t
 arch_vm_translation_map_early_query(addr_t va, addr_t* out_physical)
 {
 #warning IMPLEMENT arch_vm_translation_map_early_query

src/system/kernel/arch/ppc/arch_debug_console.cpp

@@ -11,7 +11,7 @@
 #include <arch/debug_console.h>
 #include <boot/kernel_args.h>
 #include <kernel.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 #include <string.h>
 

src/system/kernel/arch/ppc/arch_int.cpp

@@ -22,9 +22,9 @@
 #include <timer.h>
 #include <util/DoublyLinkedList.h>
 #include <util/kernel_cpp.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 
 #include <string.h>
 

src/system/kernel/arch/ppc/arch_thread.cpp

@@ -17,8 +17,8 @@
 #include <boot/stage2.h>
 #include <kernel.h>
 #include <thread.h>
-#include <vm_address_space.h>
+#include <vm/vm_types.h>
-#include <vm_types.h>
+#include <vm/VMAddressSpace.h>
 //#include <arch/vm_translation_map.h>
 
 #include <string.h>

src/system/kernel/arch/ppc/arch_vm.cpp

@@ -11,7 +11,7 @@
 #include <kernel.h>
 #include <boot/kernel_args.h>
 
-#include <vm.h>
+#include <vm/vm.h>
 #include <arch/vm.h>
 #include <arch_mmu.h>
 

src/system/kernel/arch/ppc/arch_vm_translation_map.cpp

@@ -73,9 +73,9 @@
 
 #include <KernelExport.h>
 #include <kernel.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 #include <int.h>
 #include <boot/kernel_args.h>
 #include <arch/vm_translation_map.h>

src/system/kernel/arch/x86/arch_cpu.cpp

@@ -21,9 +21,9 @@
 #include <elf.h>
 #include <smp.h>
 #include <tls.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_types.h>
-#include <vm_types.h>
+#include <vm/VMAddressSpace.h>
 
 #include <arch_system_info.h>
 #include <arch/x86/selector.h>

src/system/kernel/arch/x86/arch_debug.cpp

@@ -20,9 +20,9 @@
 #include <kernel.h>
 #include <kimage.h>
 #include <thread.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_types.h>
-#include <vm_types.h>
+#include <vm/VMAddressSpace.h>
 
 #include <arch_cpu.h>
 

src/system/kernel/arch/x86/arch_int.cpp

@@ -15,8 +15,8 @@
 #include <smp.h>
 #include <team.h>
 #include <thread.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_priv.h>
+#include <vm/vm_priv.h>
 
 #include <arch/cpu.h>
 #include <arch/int.h>

src/system/kernel/arch/x86/arch_smp.cpp

@@ -8,7 +8,7 @@
 
 
 #include <boot/kernel_args.h>
-#include <vm.h>
+#include <vm/vm.h>
 #include <int.h>
 #include <smp.h>
 #include <smp_priv.h>

src/system/kernel/arch/x86/arch_thread.cpp

@@ -21,8 +21,8 @@
 #include <thread.h>
 #include <tls.h>
 #include <tracing.h>
-#include <vm_address_space.h>
+#include <vm/vm_types.h>
-#include <vm_types.h>
+#include <vm/VMAddressSpace.h>
 
 #include "x86_paging.h"
 

src/system/kernel/arch/x86/arch_vm.cpp

@@ -16,10 +16,10 @@
 
 #include <smp.h>
 #include <util/AutoLock.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_page.h>
-#include <vm_page.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 
 #include <arch/vm.h>
 #include <arch/int.h>

src/system/kernel/arch/x86/arch_vm_translation_map.cpp

@@ -21,9 +21,9 @@
 #include <smp.h>
 #include <util/AutoLock.h>
 #include <util/queue.h>
-#include <vm_address_space.h>
+#include <vm/vm_page.h>
-#include <vm_page.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/VMAddressSpace.h>
 
 #include "x86_paging.h"
 #include "x86_physical_page_mapper.h"

src/system/kernel/arch/x86/bios.cpp

@@ -5,7 +5,7 @@
 
 
 #include <KernelExport.h>
-#include <vm_types.h>
+#include <vm/vm_types.h>
 
 #include <arch/x86/bios.h>
 

src/system/kernel/arch/x86/vm86.cpp

@@ -6,7 +6,7 @@
  * Copyright (C) 1998 by Josh Vanderhoof
  */
 
-#include <vm.h>
+#include <vm/vm.h>
 #include <thread.h>
 #include <vm86.h>
 #include <arch_cpu.h>

src/system/kernel/arch/x86/x86_physical_page_mapper_large_memory.cpp

@@ -32,10 +32,10 @@
 #include <smp.h>
 #include <util/AutoLock.h>
 #include <util/DoublyLinkedList.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_translation_map.h>
-#include <vm_translation_map.h>
+#include <vm/vm_types.h>
-#include <vm_types.h>
+#include <vm/VMAddressSpace.h>
 
 #include "x86_paging.h"
 

src/system/kernel/cache/file_cache.cpp

@@ -21,9 +21,9 @@
 #include <util/AutoLock.h>
 #include <util/kernel_cpp.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_page.h>
+#include <vm/vm_page.h>
-#include <vm_cache.h>
+#include <vm/VMCache.h>
 
 #include "IORequest.h"
 

src/system/kernel/cache/file_map.cpp

@@ -19,9 +19,9 @@
 #include <util/AutoLock.h>
 #include <util/DoublyLinkedList.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_page.h>
+#include <vm/vm_page.h>
-#include <vm_cache.h>
+#include <vm/VMCache.h>
 
 #include "kernel_debug_config.h"
 

src/system/kernel/cache/vnode_store.cpp

@@ -11,7 +11,7 @@
 
 #include <file_cache.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 #include "IORequest.h"
 

src/system/kernel/cache/vnode_store.h

@@ -7,7 +7,7 @@
 #define VNODE_STORE_H
 
 
-#include <vm_types.h>
+#include <vm/vm_types.h>
 
 
 struct file_cache_ref;

src/system/kernel/commpage.cpp

@@ -10,8 +10,8 @@
 #include <KernelExport.h>
 
 #include <elf.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_types.h>
+#include <vm/vm_types.h>
 
 
 static area_id	sCommPageArea;

src/system/kernel/debug/BreakpointManager.cpp

@@ -12,7 +12,7 @@
 #include <commpage_defs.h>
 #include <kernel.h>
 #include <util/AutoLock.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 
 //#define TRACE_BREAKPOINT_MANAGER

src/system/kernel/debug/debug.cpp

@@ -28,8 +28,8 @@
 #include <smp.h>
 #include <thread.h>
 #include <tracing.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_translation_map.h>
+#include <vm/vm_translation_map.h>
 
 #include <arch/debug_console.h>
 #include <arch/debug.h>

src/system/kernel/debug/frame_buffer_console.cpp

@@ -15,7 +15,7 @@
 #include <kernel.h>
 #include <lock.h>
 #include <boot_item.h>
-#include <vm.h>
+#include <vm/vm.h>
 #include <fs/devfs.h>
 #include <boot/kernel_args.h>
 #include <vesa_info.h>

src/system/kernel/debug/gdb.cpp

@@ -21,7 +21,7 @@
 #include <elf.h>
 #include <elf_priv.h>
 #include <smp.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 
 enum { INIT = 0, CMDREAD, CKSUM1, CKSUM2, WAITACK, QUIT, GDBSTATES };

src/system/kernel/debug/system_profiler.cpp

@@ -22,7 +22,7 @@
 #include <team.h>
 #include <thread.h>
 #include <user_debugger.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 #include <arch/debug.h>
 

src/system/kernel/debug/tracing.cpp

@@ -18,7 +18,7 @@
 #include <team.h>
 #include <thread.h>
 #include <util/AutoLock.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 
 struct tracing_stack_trace {

src/system/kernel/debug/user_debugger.cpp

@@ -26,8 +26,8 @@
 #include <thread.h>
 #include <thread_types.h>
 #include <user_debugger.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_types.h>
+#include <vm/vm_types.h>
 
 #include <AutoDeleter.h>
 #include <util/AutoLock.h>

src/system/kernel/device_manager/IORequest.cpp

@@ -14,8 +14,8 @@
 #include <kernel.h>
 #include <thread.h>
 #include <util/AutoLock.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/VMAddressSpace.h>
 
 #include "dma_resources.h"
 

src/system/kernel/device_manager/devfs.cpp

@@ -34,7 +34,7 @@
 #include <util/AutoLock.h>
 #include <util/khash.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 #include "BaseDevice.h"
 #include "FileDevice.h"

src/system/kernel/elf.cpp

@@ -31,9 +31,9 @@
 #include <util/AutoLock.h>
 #include <util/khash.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_types.h>
-#include <vm_types.h>
+#include <vm/VMAddressSpace.h>
 
 #include <arch/cpu.h>
 #include <arch/elf.h>

src/system/kernel/fs/fifo.cpp

@@ -27,7 +27,7 @@
 #include <util/AutoLock.h>
 #include <util/ring_buffer.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
 
 #include "fifo.h"
 

src/system/kernel/fs/rootfs.cpp

@@ -19,7 +19,7 @@
 #	include <khash.h>
 #	include <lock.h>
 #	include <util/AutoLock.h>
-#	include <vm.h>
+#	include <vm/vm.h>
 
 #	include <NodeMonitor.h>
 

src/system/kernel/fs/vfs.cpp

@@ -51,8 +51,8 @@
 #include <util/DoublyLinkedList.h>
 #include <util/OpenHashTable.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_cache.h>
+#include <vm/VMCache.h>
 
 #include "fifo.h"
 #include "IORequest.h"

src/system/kernel/heap.cpp

@@ -21,8 +21,8 @@
 #include <thread.h>
 #include <tracing.h>
 #include <util/AutoLock.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_page.h>
+#include <vm/vm_page.h>
 
 
 //#define TRACE_HEAP

src/system/kernel/low_resource_manager.cpp

@@ -20,8 +20,8 @@
 #include <sem.h>
 #include <util/AutoLock.h>
 #include <util/DoublyLinkedList.h>
-#include <vm_page.h>
+#include <vm/vm_page.h>
-#include <vm_priv.h>
+#include <vm/vm_priv.h>
 
 
 //#define TRACE_LOW_RESOURCE_MANAGER
@@ -176,7 +176,7 @@ compute_state(void)
 		sLowSemaphoresState = B_NO_LOW_RESOURCE;
 		sLowResources &= ~B_KERNEL_RESOURCE_SEMAPHORES;
 	}
-	
+
 	// free kernel address space state
 	// TODO: this should take fragmentation into account
 	size_t maxSpace = KERNEL_SIZE;

src/system/kernel/main.cpp

@@ -48,7 +48,7 @@
 #include <timer.h>
 #include <user_debugger.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
 #include <boot/kernel_args.h>
 
 #include "vm/VMAnonymousCache.h"

src/system/kernel/sem.cpp

@@ -28,7 +28,7 @@
 #include <util/AutoLock.h>
 #include <util/DoublyLinkedList.h>
 #include <vfs.h>
-#include <vm_page.h>
+#include <vm/vm_page.h>
 #include <boot/kernel_args.h>
 #include <syscall_restart.h>
 #include <wait_for_objects.h>

src/system/kernel/slab/Slab.cpp

@@ -27,8 +27,8 @@
 #include <util/DoublyLinkedList.h>
 #include <util/OpenHashTable.h>
 #include <util/khash.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/VMAddressSpace.h>
 
 
 // TODO kMagazineCapacity should be dynamically tuned per cache.

src/system/kernel/syscalls.cpp

@@ -47,7 +47,7 @@
 #include <usergroup.h>
 #include <util/AutoLock.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
 #include <wait_for_objects.h>
 
 #include "syscall_numbers.h"

src/system/kernel/system_info.cpp

@@ -27,8 +27,8 @@
 #include <smp.h>
 #include <team.h>
 #include <thread.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_page.h>
+#include <vm/vm_page.h>
 
 
 const static int64 kKernelVersion = 0x1;

src/system/kernel/team.cpp

@@ -47,8 +47,8 @@
 #include <user_thread.h>
 #include <usergroup.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/VMAddressSpace.h>
 #include <util/AutoLock.h>
 #include <util/khash.h>
 

src/system/kernel/thread.cpp

@@ -41,8 +41,8 @@
 #include <user_runtime.h>
 #include <user_thread.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/VMAddressSpace.h>
 #include <wait_for_objects.h>
 
 

src/system/kernel/vm/Jamfile

@@ -6,12 +6,12 @@ UseHeaders [ FDirName $(SUBDIR) $(DOTDOT) device_manager ] ;
 
 KernelMergeObject kernel_vm.o :
 	vm.cpp
-	vm_address_space.cpp
-	vm_cache.cpp
 	vm_daemons.cpp
 	vm_page.cpp
+	VMAddressSpace.cpp
 	VMAnonymousCache.cpp
 	VMAnonymousNoSwapCache.cpp
+	VMCache.cpp
 	VMDeviceCache.cpp
 	VMNullCache.cpp
 	#vm_tests.c

src/system/kernel/vm/VMAddressSpace.cpp

@@ -8,17 +8,18 @@
  */
 
 
+#include <vm/VMAddressSpace.h>
+
+#include <stdlib.h>
+
 #include <KernelExport.h>
 
 #include <util/OpenHashTable.h>
 
-#include <vm.h>
-#include <vm_address_space.h>
-#include <vm_priv.h>
 #include <heap.h>
 #include <thread.h>
-
+#include <vm/vm.h>
-#include <stdlib.h>
+#include <vm/vm_priv.h>
 
 
 //#define TRACE_VM

src/system/kernel/vm/VMAnonymousCache.cpp

@@ -35,9 +35,9 @@
 #include <util/OpenHashTable.h>
 #include <util/RadixBitmap.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_page.h>
+#include <vm/vm_page.h>
-#include <vm_priv.h>
+#include <vm/vm_priv.h>
 
 #include "IORequest.h"
 

src/system/kernel/vm/VMAnonymousCache.h

@@ -9,7 +9,7 @@
 #ifndef _KERNEL_VM_STORE_ANONYMOUS_H
 #define _KERNEL_VM_STORE_ANONYMOUS_H
 
-#include <vm_types.h>
+#include <vm/vm_types.h>
 
 
 #if ENABLE_SWAP_SUPPORT

src/system/kernel/vm/VMAnonymousNoSwapCache.cpp

@@ -14,7 +14,7 @@
 #include <arch_config.h>
 #include <heap.h>
 #include <KernelExport.h>
-#include <vm_priv.h>
+#include <vm/vm_priv.h>
 
 
 //#define TRACE_STORE

src/system/kernel/vm/VMAnonymousNoSwapCache.h

@@ -9,7 +9,7 @@
 #ifndef _KERNEL_VM_STORE_ANONYMOUS_NO_SWAP_H
 #define _KERNEL_VM_STORE_ANONYMOUS_NO_SWAP_H
 
-#include <vm_types.h>
+#include <vm/vm_types.h>
 
 
 class VMAnonymousNoSwapCache : public VMCache {

src/system/kernel/vm/VMCache.cpp

@@ -7,7 +7,7 @@
  * Distributed under the terms of the NewOS License.
  */
 
-#include <vm_cache.h>
+#include <vm/VMCache.h>
 
 #include <stddef.h>
 #include <stdlib.h>
@@ -23,10 +23,10 @@
 #include <util/khash.h>
 #include <util/AutoLock.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_page.h>
+#include <vm/vm_page.h>
-#include <vm_priv.h>
+#include <vm/vm_priv.h>
-#include <vm_types.h>
+#include <vm/vm_types.h>
 
 
 //#define TRACE_VM_CACHE

src/system/kernel/vm/VMDeviceCache.h

@@ -9,7 +9,7 @@
 #ifndef _KERNEL_VM_STORE_DEVICE_H
 #define _KERNEL_VM_STORE_DEVICE_H
 
-#include <vm_types.h>
+#include <vm/vm_types.h>
 
 
 class VMDeviceCache : public VMCache {

src/system/kernel/vm/VMNullCache.h

@@ -9,7 +9,7 @@
 #ifndef _KERNEL_VM_STORE_NULL_H
 #define _KERNEL_VM_STORE_NULL_H
 
-#include <vm_types.h>
+#include <vm/vm_types.h>
 
 
 class VMNullCache : public VMCache {

src/system/kernel/vm/vm.cpp

@@ -8,7 +8,7 @@
  */
 
 
-#include <vm.h>
+#include <vm/vm.h>
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -44,10 +44,10 @@
 #include <tracing.h>
 #include <util/AutoLock.h>
 #include <util/khash.h>
-#include <vm_address_space.h>
+#include <vm/vm_page.h>
-#include <vm_cache.h>
+#include <vm/vm_priv.h>
-#include <vm_page.h>
+#include <vm/VMAddressSpace.h>
-#include <vm_priv.h>
+#include <vm/VMCache.h>
 
 #include "VMAnonymousCache.h"
 #include "IORequest.h"

src/system/kernel/vm/vm_daemons.cpp

@@ -13,10 +13,11 @@
 #include <OS.h>
 
 #include <tracing.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_priv.h>
+#include <vm/vm_priv.h>
-#include <vm_cache.h>
+#include <vm/vm_page.h>
-#include <vm_page.h>
+#include <vm/VMCache.h>
+
 #include "VMAnonymousCache.h"
 
 

src/system/kernel/vm/vm_page.cpp

@@ -27,11 +27,11 @@
 #include <tracing.h>
 #include <util/AutoLock.h>
 #include <vfs.h>
-#include <vm.h>
+#include <vm/vm.h>
-#include <vm_address_space.h>
+#include <vm/vm_priv.h>
-#include <vm_priv.h>
+#include <vm/vm_page.h>
-#include <vm_page.h>
+#include <vm/VMAddressSpace.h>
-#include <vm_cache.h>
+#include <vm/VMCache.h>
 
 #include "VMAnonymousCache.h"
 #include "IORequest.h"