From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 18 Jul 2008 17:53:16 +0000 (+0200)
Subject: Merge branch 'linus' into timers/nohz
X-Git-Tag: v2.6.27-rc1~513^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=9b610fda0df5d0f0b0c64242e37441ad1b384aac;p=linux.git

Merge branch 'linus' into timers/nohz
---

9b610fda0df5d0f0b0c64242e37441ad1b384aac
diff --cc arch/x86/kernel/process_32.c
index 1f5fa1cf16dd,0c3927accb00..53bc653ed5ca
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@@ -166,9 -128,8 +128,8 @@@ void cpu_idle(void
  
  	/* endless idle loop with no priority at all */
  	while (1) {
 -		tick_nohz_stop_sched_tick();
 +		tick_nohz_stop_sched_tick(1);
  		while (!need_resched()) {
- 			void (*idle)(void);
  
  			check_pgt_cache();
  			rmb();
diff --cc arch/x86/kernel/process_64.c
index c0a5c2a687e6,a8e53626ac9a..9a10c1897921
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@@ -148,14 -120,11 +120,11 @@@ void cpu_idle(void
  	current_thread_info()->status |= TS_POLLING;
  	/* endless idle loop with no priority at all */
  	while (1) {
 -		tick_nohz_stop_sched_tick();
 +		tick_nohz_stop_sched_tick(1);
  		while (!need_resched()) {
- 			void (*idle)(void);
  
  			rmb();
- 			idle = pm_idle;
- 			if (!idle)
- 				idle = default_idle;
+ 
  			if (cpu_is_offline(smp_processor_id()))
  				play_dead();
  			/*