lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: clean up ARCH_SETUP

Browse Source 
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>
This commit is contained in:
Yinghai Lu
2008-06-25 19:52:15 -07:00
committed by Ingo Molnar
parent 611dfd7819
commit 042623bbab
3 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/setup.c
View File

@@ -101,11 +101,7 @@
#include <asm/proto.h> #include <asm/proto.h>
#include <mach_apic.h> #include <mach_apic.h>
#ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h> #include <asm/paravirt.h>
#else
#define ARCH_SETUP
#endif
#include <asm/percpu.h> #include <asm/percpu.h>
#include <asm/sections.h> #include <asm/sections.h>
@@ -115,6 +111,10 @@
#include <asm/numa_64.h> #include <asm/numa_64.h>
#endif #endif
#ifndef ARCH_SETUP
#define ARCH_SETUP
#endif
#ifndef CONFIG_DEBUG_BOOT_PARAMS #ifndef CONFIG_DEBUG_BOOT_PARAMS
struct boot_params __initdata boot_params; struct boot_params __initdata boot_params;
#else #else

4
include/asm-x86/mach-default/setup_arch.h
View File

@@ -1,7 +1,3 @@
/* Hook to call BIOS initialisation function */ /* Hook to call BIOS initialisation function */
/* no action for generic */ /* no action for generic */
#ifndef ARCH_SETUP
#define ARCH_SETUP
#endif

2
include/asm-x86/mach-visws/setup_arch.h
View File

@@ -4,5 +4,3 @@ extern unsigned long sgivwfb_mem_phys;
extern unsigned long sgivwfb_mem_size; extern unsigned long sgivwfb_mem_size;
/* no action for visws */ /* no action for visws */
#define ARCH_SETUP