aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/xen
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/xen
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/xen')
-rw-r--r--arch/x86/xen/enlighten.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 50b20c64f0bd..73c7b1d610f3 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -841,7 +841,6 @@ static const struct pv_init_ops xen_init_ops __initdata = {
841 .patch = xen_patch, 841 .patch = xen_patch,
842 842
843 .banner = xen_banner, 843 .banner = xen_banner,
844 .arch_setup = xen_arch_setup,
845 .post_allocator_init = xen_post_allocator_init, 844 .post_allocator_init = xen_post_allocator_init,
846}; 845};
847 846
@@ -982,6 +981,7 @@ asmlinkage void __init xen_start_kernel(void)
982 pv_mmu_ops = xen_mmu_ops; 981 pv_mmu_ops = xen_mmu_ops;
983 982
984 x86_init.resources.memory_setup = xen_memory_setup; 983 x86_init.resources.memory_setup = xen_memory_setup;
984 x86_init.oem.arch_setup = xen_arch_setup;
985 985
986#ifdef CONFIG_X86_64 986#ifdef CONFIG_X86_64
987 /* 987 /*