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

Commit fb26132b authored by Jaswinder Singh's avatar Jaswinder Singh Committed by Ingo Molnar
Browse files

x86: process_32.c declare cpu_number before they get used 



Moved DECLARE_PER_CPU(int, cpu_number) from CONFIG_X86_32_SMP to CONFIG_X86_32
because cpu_number is required for both.
And include asm/smp.h in process_32.c

Signed-off-by: default avatarJaswinder Singh <jaswinder@infradead.org>
parent bbc1f698

arch/x86/kernel/process_32.c

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include <asm/cpu.h>

#include <asm/kdebug.h>

#include <asm/syscalls.h>

#include <asm/smp.h>



asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");

include/asm-x86/smp.h

+3 −1
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ extern cpumask_t cpu_initialized; 
DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);

DECLARE_PER_CPU(cpumask_t, cpu_core_map);

DECLARE_PER_CPU(u16, cpu_llc_id);

#ifdef CONFIG_X86_32

DECLARE_PER_CPU(int, cpu_number);

#endif



DECLARE_EARLY_PER_CPU(u16, x86_cpu_to_apicid);

DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid);
@@ -142,7 +145,6 @@ extern unsigned disabled_cpus __cpuinitdata; 
 * from the initial startup. We map APIC_BASE very early in page_setup(),

 * so this is correct in the x86 case.

 */

DECLARE_PER_CPU(int, cpu_number);

#define raw_smp_processor_id() (x86_read_percpu(cpu_number))

extern int safe_smp_processor_id(void);