Update to 3.2-rc4
svn path=/dists/trunk/linux-2.6/; revision=18341
This commit is contained in:
parent
009b172275
commit
0a1d59767e
|
@ -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
|
* New upstream release candidate
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@ delivery problem for real.
|
||||||
|
|
||||||
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||||||
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
||||||
|
[bwh: Adjust context in __remove_hrtimer() for v3.2-rc4]
|
||||||
---
|
---
|
||||||
include/linux/hrtimer.h | 3
|
include/linux/hrtimer.h | 3
|
||||||
kernel/hrtimer.c | 190 ++++++++++++++++++++++++++++++++++++++++++-----
|
kernel/hrtimer.c | 190 ++++++++++++++++++++++++++++++++++++++++++-----
|
||||||
|
@ -127,9 +127,9 @@ Index: linux-3.2/kernel/hrtimer.c
|
||||||
+ goto out;
|
+ goto out;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
if (&timer->node == timerqueue_getnext(&base->active)) {
|
next_timer = timerqueue_getnext(&base->active);
|
||||||
#ifdef CONFIG_HIGH_RES_TIMERS
|
timerqueue_del(&base->active, &timer->node);
|
||||||
/* Reprogram the clock event device. if enabled */
|
if (&timer->node == next_timer) {
|
||||||
@@ -1176,6 +1210,7 @@ static void __hrtimer_init(struct hrtime
|
@@ -1176,6 +1210,7 @@ static void __hrtimer_init(struct hrtime
|
||||||
|
|
||||||
base = hrtimer_clockid_to_base(clock_id);
|
base = hrtimer_clockid_to_base(clock_id);
|
||||||
|
|
Loading…
Reference in New Issue