summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup.c
diff options
context:
space:
mode:
authorThomas Gleixner2009-08-20 13:04:10 +0200
committerThomas Gleixner2009-08-31 09:35:45 +0200
commit42bbdb43b16d233b2dacb4cd76e28f61c2a86dc6 (patch)
treef70bc7a928b5131e69971ff1fb5a30a0bb8f52c3 /arch/x86/kernel/setup.c
parentx86: Move traps_init to x86_init_ops (diff)
downloadkernel-qcow2-linux-42bbdb43b16d233b2dacb4cd76e28f61c2a86dc6.tar.gz
kernel-qcow2-linux-42bbdb43b16d233b2dacb4cd76e28f61c2a86dc6.tar.xz
kernel-qcow2-linux-42bbdb43b16d233b2dacb4cd76e28f61c2a86dc6.zip
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 @@
#include <asm/numa_64.h>
#endif
-#ifndef ARCH_SETUP
-#define ARCH_SETUP
-#endif
-
/*
* end_pfn only includes RAM, while max_pfn_mapped includes all e820 entries.
* 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)
}
#endif
- ARCH_SETUP
+ x86_init.oem.arch_setup();
setup_memory_map();
parse_setup_data();