Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched

* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
  sched: proper prototype for kernel/sched.c:migration_init()
  sched: avoid large irq-latencies in smp-balancing
  sched: fix copy_namespace() <-> sched_fork() dependency in do_fork
  sched: clean up the wakeup preempt check, #2
  sched: clean up the wakeup preempt check
  sched: wakeup preemption fix
  sched: remove PREEMPT_RESTRICT
  sched: turn off PREEMPT_RESTRICT
  KVM: fix !SMP build error
  x86: make nmi_cpu_busy() always defined
  x86: make ipi_handler() always defined
  sched: cleanup, use NSEC_PER_MSEC and NSEC_PER_SEC
  sched: reintroduce SMP tunings again
  sched: restore deterministic CPU accounting on powerpc
  sched: fix delay accounting regression
  sched: reintroduce the sched_min_granularity tunable
  sched: documentation: place_entity() comments
  sched: fix vslice

diff --cc arch/powerpc/kernel/time.c
index 99ebcd3884d26bd5fe80a821dc05e183b232f7c0,a70dfb76d0a8adff62612befd4770f46dc063fb2..4beb6329dfb7f9158b651d9abfcb2951465e00b8
--- 1/arch/powerpc/kernel/time.c
--- 2/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@@ -599,18 -586,10 +586,8 @@@ void timer_interrupt(struct pt_regs * r
                get_lppaca()->int_dword.fields.decr_int = 0;
  #endif
  
-       /*
-        * We cannot disable the decrementer, so in the period
-        * between this cpu's being marked offline in cpu_online_map
-        * and calling stop-self, it is taking timer interrupts.
-        * Avoid calling into the scheduler rebalancing code if this
-        * is the case.
-        */
-       if (!cpu_is_offline(cpu))
-               account_process_time(regs);
- 
        if (evt->event_handler)
                evt->event_handler(evt);
 -      else
 -              evt->set_next_event(DECREMENTER_MAX, evt);
  
  #ifdef CONFIG_PPC_ISERIES
        if (firmware_has_feature(FW_FEATURE_ISERIES) && hvlpevent_is_pending())