x86 fixes
Linus, please pull the latest x86 git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86.git
5 fixes. Thanks!
Ingo
------------------>
Adrian Bunk (4):
x86 apic_32.c section fix
x86 smpboot_32.c section fixes
x86_32: select_idle_routine() must be __cpuinit
x86_32: disable_pse must be __cpuinitdata
Mike Travis (1):
x86: fix show cpuinfo cpu number always zero
apic_32.c | 2 +- process_32.c | 2 +- setup_32.c | 2 +- smpboot_32.c | 6 +++--- smpboot_64.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-)
arch/x86/kernel/apic_32.c +1 -1
@@ -849,7 +849,7 @@ void __init init_bsp_APIC(void)/** * setup_local_APIC - setup the local APIC */ -void __devinit setup_local_APIC (void ) +void __cpuinit setup_local_APIC (void ) {unsigned long oldvalue, value, maxlvt, integrated;int i, j;
arch/x86/kernel/process_32.c +1 -1
@@ -261,7 +261,7 @@ static void mwait_idle(void)mwait_idle_with_hints (0 ,0 ); } -void __devinit select_idle_routine (const struct cpuinfo_x86 *c) +void __cpuinit select_idle_routine (const struct cpuinfo_x86 *c) {if (cpu_has (c,X86_FEATURE_MWAIT )) {printk ("monitor/mwait feature present.\n" );
arch/x86/kernel/setup_32.c +1 -1
@@ -67,7 +67,7 @@address, and must not be in the .bss segment! */ unsigned long init_pg_tables_end__initdata = ~0UL ; -int disable_pse__devinitdata =0 ; +int disable_pse__cpuinitdata =0 ;/* * Machine setup..
arch/x86/kernel/smpboot_32.c +3 -3
@@ -60,7 +60,7 @@#include <asm/mtrr.h> /* Set if we find a B stepping CPU */ -static int __devinitdata smp_b_stepping; +static int __cpuinitdata smp_b_stepping;/* Number of siblings per CPU package */ int smp_num_siblings =1 ;
@@ -745,8 +745,8 @@ static inline int alloc_cpu_id(void) }#ifdef CONFIG_HOTPLUG_CPU -static struct task_struct *__devinitdata cpu_idle_tasks[NR_CPUS ]; -static inline struct task_struct *alloc_idle_task (int cpu) +static struct task_struct *__cpuinitdata cpu_idle_tasks[NR_CPUS ]; +static inline struct task_struct *__cpuinit alloc_idle_task (int cpu) {struct task_struct *idle;
arch/x86/kernel/smpboot_64.c +1 -1
@@ -141,8 +141,8 @@ static void __cpuinit smp_store_cpu_info(int id)struct cpuinfo_x86 *c = &cpu_data (id); *c = boot_cpu_data; - c->cpu_index = id;identify_cpu (c); + c->cpu_index = id;print_cpu_info (c); }