aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-08-20 07:04:10 -0400
committerThomas Gleixner <tglx@linutronix.de>2009-08-31 03:35:45 -0400
commit42bbdb43b16d233b2dacb4cd76e28f61c2a86dc6 (patch)
treef70bc7a928b5131e69971ff1fb5a30a0bb8f52c3 /arch/x86/kernel/setup.c
parent428cf9025b15573e16e658032f2b963283e34ae0 (diff)
x86: Replace ARCH_SETUP by a proper x86_init_ops
ARCH_SETUP is a horrible leftover from the old arch/i386 mach support code. It still has a lonely user in xen. Move it to x86_init_ops. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r--arch/x86/kernel/setup.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index bf3b87f1f7db..d12aa82c9c32 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -108,10 +108,6 @@
108#include <asm/numa_64.h> 108#include <asm/numa_64.h>
109#endif 109#endif
110 110
111#ifndef ARCH_SETUP
112#define ARCH_SETUP
113#endif
114
115/* 111/*
116 * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries. 112 * end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
117 * The direct mapping extends to max_pfn_mapped, so that we can directly access 113 * The direct mapping extends to max_pfn_mapped, so that we can directly access
@@ -750,7 +746,7 @@ void __init setup_arch(char **cmdline_p)
750 } 746 }
751#endif 747#endif
752 748
753 ARCH_SETUP 749 x86_init.oem.arch_setup();
754 750
755 setup_memory_map(); 751 setup_memory_map();
756 parse_setup_data(); 752 parse_setup_data();