From 4988ca58a0b6f12e48286fe17ee651be490e0f24 Mon Sep 17 00:00:00 2001
From: Alex Smith <alex@alex-smith.me.uk>
Date: Wed, 4 Jul 2012 14:55:11 +0100
Subject: [PATCH] Build arch_vm.cpp for x86_64. No changes required except for
 temporarily disabling bios_init call.

---
 src/system/kernel/arch/x86/64/stubs.cpp | 57 -------------------------
 src/system/kernel/arch/x86/Jamfile      |  2 +-
 src/system/kernel/arch/x86/arch_vm.cpp  |  5 +++
 3 files changed, 6 insertions(+), 58 deletions(-)

diff --git a/src/system/kernel/arch/x86/64/stubs.cpp b/src/system/kernel/arch/x86/64/stubs.cpp
index 281948e1a0..348887c54c 100644
--- a/src/system/kernel/arch/x86/64/stubs.cpp
+++ b/src/system/kernel/arch/x86/64/stubs.cpp
@@ -479,63 +479,6 @@ x86_init_user_debug()
 }
 
 
-status_t
-arch_vm_init(kernel_args *args)
-{
-	return B_OK;
-}
-
-
-status_t
-arch_vm_init_post_area(kernel_args *args)
-{
-	return B_OK;
-}
-
-
-status_t
-arch_vm_init_end(kernel_args *args)
-{
-	return B_OK;
-}
-
-
-status_t
-arch_vm_init_post_modules(kernel_args *args)
-{
-	return B_OK;
-}
-
-
-void
-arch_vm_aspace_swap(struct VMAddressSpace *from, struct VMAddressSpace *to)
-{
-
-}
-
-
-bool
-arch_vm_supports_protection(uint32 protection)
-{
-	return true;
-}
-
-
-void
-arch_vm_unset_memory_type(struct VMArea *area)
-{
-
-}
-
-
-status_t
-arch_vm_set_memory_type(struct VMArea *area, phys_addr_t physicalBase,
-	uint32 type)
-{
-	return B_OK;
-}
-
-
 status_t
 arch_vm_translation_map_create_map(bool kernel, VMTranslationMap** _map)
 {
diff --git a/src/system/kernel/arch/x86/Jamfile b/src/system/kernel/arch/x86/Jamfile
index 7502f4d3e4..256aaf72b3 100644
--- a/src/system/kernel/arch/x86/Jamfile
+++ b/src/system/kernel/arch/x86/Jamfile
@@ -43,7 +43,6 @@ if $(TARGET_ARCH) = x86_64 {
 		arch_smp.cpp
 		arch_thread.cpp
 		arch_timer.cpp
-		arch_vm.cpp
 		arch_vm_translation_map.cpp
 		arch_system_info.cpp
 		arch_user_debugger.cpp
@@ -87,6 +86,7 @@ local archGenericSources =
 	arch_cpu.cpp
 	arch_debug_console.cpp
 	arch_int.cpp
+	arch_vm.cpp
 	pic.cpp
 ;
 
diff --git a/src/system/kernel/arch/x86/arch_vm.cpp b/src/system/kernel/arch/x86/arch_vm.cpp
index 51715ecadd..8fe04923de 100644
--- a/src/system/kernel/arch/x86/arch_vm.cpp
+++ b/src/system/kernel/arch/x86/arch_vm.cpp
@@ -656,7 +656,12 @@ arch_vm_init_post_area(kernel_args *args)
 		return B_NO_MEMORY;
 	}
 
+	// TODO x86_64
+#ifndef __x86_64__
 	return bios_init();
+#else
+	return B_OK;
+#endif
 }