Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f0be02c authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: move boot_params declaring to setup.c 



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

arch/x86/kernel/cpu/common_64.c

+0 −6
Original line number Diff line number Diff line
@@ -421,12 +421,6 @@ static __init int setup_disablecpuid(char *arg) 
}

__setup("clearcpuid=", setup_disablecpuid);



#ifndef CONFIG_DEBUG_BOOT_PARAMS

struct boot_params __initdata boot_params;

#else

struct boot_params boot_params;

#endif



cpumask_t cpu_initialized __cpuinitdata = CPU_MASK_NONE;



struct x8664_pda **_cpu_pda __read_mostly;

arch/x86/kernel/setup.c

+6 −0
Original line number Diff line number Diff line
@@ -15,6 +15,12 @@ 
#include <asm/apicdef.h>

#include <asm/highmem.h>



#ifndef CONFIG_DEBUG_BOOT_PARAMS

struct boot_params __initdata boot_params;

#else

struct boot_params boot_params;

#endif



#ifdef CONFIG_X86_LOCAL_APIC

unsigned int num_processors;

unsigned disabled_cpus __cpuinitdata;

arch/x86/kernel/setup_32.c

+0 −6
Original line number Diff line number Diff line
@@ -163,12 +163,6 @@ unsigned long saved_video_mode; 


static char __initdata command_line[COMMAND_LINE_SIZE];



#ifndef CONFIG_DEBUG_BOOT_PARAMS

struct boot_params __initdata boot_params;

#else

struct boot_params boot_params;

#endif



#if defined(CONFIG_EDD) || defined(CONFIG_EDD_MODULE)

struct edd edd;

#ifdef CONFIG_EDD_MODULE