From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 12 Jan 2009 10:32:03 +0000 (+0100)
Subject: Merge commit 'v2.6.29-rc1' into timers/hrtimers
X-Git-Tag: master-2009-03-27~7^2~3^4~2
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=e3ee1e123183ca9847e74b7b8e2694c9e3b817a6;p=~andy%2Flinux

Merge commit 'v2.6.29-rc1' into timers/hrtimers

Conflicts:
	kernel/time/tick-common.c
---

e3ee1e123183ca9847e74b7b8e2694c9e3b817a6
diff --cc kernel/time/tick-common.c
index 457d281258e,63e05d423a0..21a5ca84951
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
@@@ -273,21 -273,6 +273,21 @@@ out_bc
  	return ret;
  }
  
 +/*
 + * Transfer the do_timer job away from a dying cpu.
 + *
 + * Called with interrupts disabled.
 + */
 +static void tick_handover_do_timer(int *cpup)
 +{
 +	if (*cpup == tick_do_timer_cpu) {
- 		int cpu = first_cpu(cpu_online_map);
++		int cpu = cpumask_first(cpu_online_mask);
 +
- 		tick_do_timer_cpu = (cpu != NR_CPUS) ? cpu :
++		tick_do_timer_cpu = (cpu < nr_cpu_ids) ? cpu :
 +			TICK_DO_TIMER_NONE;
 +	}
 +}
 +
  /*
   * Shutdown an event device on a given cpu:
   *