[kernel] r19306 - dists/sid/linux/debian/patches/features/all/rt

[Ben Hutchings]

Author: benh
Date: Fri Aug  3 01:55:45 2012
New Revision: 19306

Log:
Undo context change for Debian ABI bodge, now removed

Modified:
   dists/sid/linux/debian/patches/features/all/rt/0133-hrtimers-prepare-full-preemption.patch

Modified: dists/sid/linux/debian/patches/features/all/rt/0133-hrtimers-prepare-full-preemption.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/all/rt/0133-hrtimers-prepare-full-preemption.patch	Fri Aug  3 01:41:42 2012	(r19305)
+++ dists/sid/linux/debian/patches/features/all/rt/0133-hrtimers-prepare-full-preemption.patch	Fri Aug  3 01:55:45 2012	(r19306)
@@ -8,7 +8,6 @@
 
 Signed-off-by: Ingo Molnar <mingo at elte.hu>
 Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
-[bwh: Adjust context for ABI bodge in struct hrtimer_cpu_base]
 ---
  include/linux/hrtimer.h |   10 ++++++++++
  kernel/hrtimer.c        |   33 ++++++++++++++++++++++++++++++++-
@@ -18,7 +17,7 @@
 
 --- a/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;
  	ktime_t				max_hang_time;
  #endif
@@ -26,9 +25,9 @@
 +	wait_queue_head_t		wait;
 +#endif
  	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);
  }