Undo context change for Debian ABI bodge, now removed
svn path=/dists/sid/linux/; revision=19306
This commit is contained in:
parent
28f28f994c
commit
608bf2b1f8
|
@ -8,7 +8,6 @@ against preemption.
|
||||||
|
|
||||||
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
||||||
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||||||
[bwh: Adjust context for ABI bodge in struct hrtimer_cpu_base]
|
|
||||||
---
|
---
|
||||||
include/linux/hrtimer.h | 10 ++++++++++
|
include/linux/hrtimer.h | 10 ++++++++++
|
||||||
kernel/hrtimer.c | 33 ++++++++++++++++++++++++++++++++-
|
kernel/hrtimer.c | 33 ++++++++++++++++++++++++++++++++-
|
||||||
|
@ -18,7 +17,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||||||
|
|
||||||
--- a/include/linux/hrtimer.h
|
--- a/include/linux/hrtimer.h
|
||||||
+++ b/include/linux/hrtimer.h
|
+++ b/include/linux/hrtimer.h
|
||||||
@@ -188,6 +188,9 @@ struct hrtimer_cpu_base {
|
@@ -189,6 +189,9 @@ struct hrtimer_cpu_base {
|
||||||
unsigned long nr_hangs;
|
unsigned long nr_hangs;
|
||||||
ktime_t max_hang_time;
|
ktime_t max_hang_time;
|
||||||
#endif
|
#endif
|
||||||
|
@ -26,9 +25,9 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
|
||||||
+ wait_queue_head_t wait;
|
+ wait_queue_head_t wait;
|
||||||
+#endif
|
+#endif
|
||||||
struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES];
|
struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES];
|
||||||
#ifndef __GENKSYMS__
|
};
|
||||||
unsigned int clock_was_set;
|
|
||||||
@@ -384,6 +387,13 @@ static inline int hrtimer_restart(struct
|
@@ -382,6 +385,13 @@ static inline int hrtimer_restart(struct
|
||||||
return hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
|
return hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue