summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-25 19:52:15 -0700
committerIngo Molnar <mingo@elte.hu>2008-07-08 13:16:00 +0200
commit042623bbabae168246ad8a37693f0ecb6c450aea (patch)
tree23d2738e60abb8615b96e026c4c16604aa0e73d7 /arch/x86/kernel
parent611dfd7819e525b45f39ff15e0faf5f23551c113 (diff)
downloadblackbird-op-linux-042623bbabae168246ad8a37693f0ecb6c450aea.tar.gz
blackbird-op-linux-042623bbabae168246ad8a37693f0ecb6c450aea.zip
x86: clean up ARCH_SETUP
asm-x86/paravirt.h already have protection with CONFIG_PARAVIRT inside Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/setup.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 63dbb5e8f7ee..161609c6925e 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -101,11 +101,7 @@
#include <asm/proto.h>
#include <mach_apic.h>
-#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h>
-#else
-#define ARCH_SETUP
-#endif
#include <asm/percpu.h>
#include <asm/sections.h>
@@ -115,6 +111,10 @@
#include <asm/numa_64.h>
#endif
+#ifndef ARCH_SETUP
+#define ARCH_SETUP
+#endif
+
#ifndef CONFIG_DEBUG_BOOT_PARAMS
struct boot_params __initdata boot_params;
#else
OpenPOWER on IntegriCloud