[linux] 01/04: Refresh "hrtimers: prepare full preemption" properly after hrtimer ABI fix

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy
in repository linux.

commit 4bfed7874f308c6aaab3b9d75104faebb148d11c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Mar 3 01:16:32 2016 +0000

    Refresh "hrtimers: prepare full preemption" properly after hrtimer ABI fix
---
 .../all/rt/0133-hrtimers-prepare-full-preemption.patch         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/patches/features/all/rt/0133-hrtimers-prepare-full-preemption.patch b/debian/patches/features/all/rt/0133-hrtimers-prepare-full-preemption.patch
index 35690a9..7e2922f 100644
--- a/debian/patches/features/all/rt/0133-hrtimers-prepare-full-preemption.patch
+++ b/debian/patches/features/all/rt/0133-hrtimers-prepare-full-preemption.patch
@@ -17,7 +17,7 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
 
 --- a/include/linux/hrtimer.h
 +++ b/include/linux/hrtimer.h
-@@ -191,6 +191,9 @@ struct hrtimer_cpu_base {
+@@ -195,6 +195,9 @@ struct hrtimer_cpu_base {
  	unsigned long			nr_hangs;
  	ktime_t				max_hang_time;
  #endif
@@ -27,7 +27,7 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
  	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];
  };
  
-@@ -407,6 +410,13 @@ static inline int hrtimer_restart(struct
+@@ -411,6 +414,13 @@ static inline int hrtimer_restart(struct
  	return hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
  }
  
@@ -40,7 +40,7 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
 +
  /* Query timers: */
  extern ktime_t __hrtimer_get_remaining(const struct hrtimer *timer, bool adjust);
- 
+ extern ktime_t hrtimer_get_remaining(const struct hrtimer *timer);
 --- a/kernel/hrtimer.c
 +++ b/kernel/hrtimer.c
 @@ -874,6 +874,32 @@ u64 hrtimer_forward(struct hrtimer *time
@@ -85,7 +85,7 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
  	}
  }
  EXPORT_SYMBOL_GPL(hrtimer_cancel);
-@@ -1554,6 +1580,8 @@ void hrtimer_run_queues(void)
+@@ -1559,6 +1585,8 @@ void hrtimer_run_queues(void)
  		}
  		raw_spin_unlock(&cpu_base->lock);
  	}
@@ -94,7 +94,7 @@ Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
  }
  
  /*
-@@ -1714,6 +1742,9 @@ static void __cpuinit init_hrtimers_cpu(
+@@ -1719,6 +1747,9 @@ static void __cpuinit init_hrtimers_cpu(
  	}
  
  	hrtimer_init_hres(cpu_base);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git