Commit 042623bb authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: clean up ARCH_SETUP 



asm-x86/paravirt.h already have protection with CONFIG_PARAVIRT inside

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 611dfd78

arch/x86/kernel/setup.c

+4 −4
Original line number Diff line number Diff line
@@ -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

include/asm-x86/mach-default/setup_arch.h

+0 −4
Original line number Diff line number Diff line 
/* Hook to call BIOS initialisation function */



/* no action for generic */
 


#ifndef ARCH_SETUP

#define ARCH_SETUP

#endif

include/asm-x86/mach-visws/setup_arch.h

+0 −2
Original line number Diff line number Diff line
@@ -4,5 +4,3 @@ extern unsigned long sgivwfb_mem_phys; 
extern unsigned long sgivwfb_mem_size;



/* no action for visws */
 


#define ARCH_SETUP