Signed-off-by: Andrew Morton --- 25-akpm/arch/i386/kernel/process.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/i386/kernel/process.c~remove-rcu-abuse-in-cpu_idle-warning-fix arch/i386/kernel/process.c --- 25/arch/i386/kernel/process.c~remove-rcu-abuse-in-cpu_idle-warning-fix 2004-12-12 22:30:10.200626944 -0800 +++ 25-akpm/arch/i386/kernel/process.c 2004-12-12 22:39:57.356365704 -0800 @@ -95,7 +95,7 @@ EXPORT_SYMBOL(enable_hlt); */ void default_idle(void) { - if (!hlt_counter && current_cpu_data.hlt_works_ok) { + if (!hlt_counter && boot_cpu_data.hlt_works_ok) { local_irq_disable(); if (!need_resched()) safe_halt(); @@ -146,7 +146,7 @@ static void poll_idle (void) */ void cpu_idle (void) { - int cpu = smp_processor_id(); + int cpu = _smp_processor_id(); /* endless idle loop with no priority at all */ while (1) { @@ -161,7 +161,7 @@ void cpu_idle (void) if (!idle) idle = default_idle; - irq_stat[smp_processor_id()].idle_timestamp = jiffies; + irq_stat[cpu].idle_timestamp = jiffies; idle(); } schedule(); _