[kernel] r18341 - in dists/trunk/linux-2.6/debian: . patches/features/all/rt

[Ben Hutchings]

Author: benh
Date: Fri Dec  2 03:48:40 2011
New Revision: 18341

Log:
Update to 3.2-rc4

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/features/all/rt/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Fri Dec  2 03:18:32 2011	(r18340)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Dec  2 03:48:40 2011	(r18341)
@@ -1,4 +1,4 @@
-linux-2.6 (3.2~rc3-1~experimental.1) UNRELEASED; urgency=low
+linux-2.6 (3.2~rc4-1~experimental.1) UNRELEASED; urgency=low
 
   * New upstream release candidate
 

Modified: dists/trunk/linux-2.6/debian/patches/features/all/rt/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/rt/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch	Fri Dec  2 03:18:32 2011	(r18340)
+++ dists/trunk/linux-2.6/debian/patches/features/all/rt/hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch	Fri Dec  2 03:48:40 2011	(r18341)
@@ -10,7 +10,7 @@
 
 Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
 Signed-off-by: Ingo Molnar <mingo at elte.hu>
-
+[bwh: Adjust context in __remove_hrtimer() for v3.2-rc4]
 ---
  include/linux/hrtimer.h  |    3 
  kernel/hrtimer.c         |  190 ++++++++++++++++++++++++++++++++++++++++++-----
@@ -127,9 +127,9 @@
 +		goto out;
 +	}
 +
- 	if (&timer->node == timerqueue_getnext(&base->active)) {
- #ifdef CONFIG_HIGH_RES_TIMERS
- 		/* Reprogram the clock event device. if enabled */
+ 	next_timer = timerqueue_getnext(&base->active);
+ 	timerqueue_del(&base->active, &timer->node);
+ 	if (&timer->node == next_timer) {
 @@ -1176,6 +1210,7 @@ static void __hrtimer_init(struct hrtime
  
  	base = hrtimer_clockid_to_base(clock_id);