diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 14:22:45 -0700 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-10-20 14:22:45 -0700 |
commit | d25e6b0b326278a1096e8334584c3e64517057a3 (patch) | |
tree | 3c914b877adf9615c7158b58705478e56c9b4247 /arch/x86/include/asm/cpu.h | |
parent | e44dea35ccb78ab7dc3a75ccec71d7d6f35017c4 (diff) | |
parent | 40ffa93791985ab300fd488072e9f37ccf72e88c (diff) |
Merge branch 'x86/cleanups' into x86/trampoline
Diffstat (limited to 'arch/x86/include/asm/cpu.h')
-rw-r--r-- | arch/x86/include/asm/cpu.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index b185091bf19c..4fab24de26b1 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -32,6 +32,5 @@ extern void arch_unregister_cpu(int); DECLARE_PER_CPU(int, cpu_state); -extern unsigned int boot_cpu_id; #endif /* _ASM_X86_CPU_H */ |