[kernel] r20201 - in dists/wheezy/linux/debian/patches: . features/all/rt

[Ben Hutchings]

Author: benh
Date: Wed Jun  5 04:05:14 2013
New Revision: 20201

Log:
[rt] Rebase onto 3.2.46

- Resolve conflict with 'timer: Don't reinitialize the cpu base lock
  during CPU_UP_PREPARE' consistently with 3.4.47-rt62
- Drop 'tcp: force a dst refcount when prequeue packet' which is in 3.2.46

Deleted:
   dists/wheezy/linux/debian/patches/features/all/rt/0304-tcp-force-a-dst-refcount-when-prequeue-packet.patch
Modified:
   dists/wheezy/linux/debian/patches/features/all/rt/0126-timers-prepare-for-full-preemption.patch
   dists/wheezy/linux/debian/patches/series-rt

Modified: dists/wheezy/linux/debian/patches/features/all/rt/0126-timers-prepare-for-full-preemption.patch
==============================================================================
--- dists/wheezy/linux/debian/patches/features/all/rt/0126-timers-prepare-for-full-preemption.patch	Wed Jun  5 03:43:11 2013	(r20200)
+++ dists/wheezy/linux/debian/patches/features/all/rt/0126-timers-prepare-for-full-preemption.patch	Wed Jun  5 04:05:14 2013	(r20201)
@@ -14,11 +14,9 @@
  kernel/timer.c        |   35 ++++++++++++++++++++++++++++++++---
  2 files changed, 33 insertions(+), 4 deletions(-)
 
-diff --git a/include/linux/timer.h b/include/linux/timer.h
-index 6abd913..b703477 100644
 --- a/include/linux/timer.h
 +++ b/include/linux/timer.h
-@@ -276,7 +276,7 @@ extern void add_timer(struct timer_list *timer);
+@@ -276,7 +276,7 @@ extern void add_timer(struct timer_list
  
  extern int try_to_del_timer_sync(struct timer_list *timer);
  
@@ -27,8 +25,6 @@
    extern int del_timer_sync(struct timer_list *timer);
  #else
  # define del_timer_sync(t)		del_timer(t)
-diff --git a/kernel/timer.c b/kernel/timer.c
-index c219db6..d30347a 100644
 --- a/kernel/timer.c
 +++ b/kernel/timer.c
 @@ -76,6 +76,7 @@ struct tvec_root {
@@ -39,7 +35,7 @@
  	unsigned long timer_jiffies;
  	unsigned long next_timer;
  	struct tvec_root tv1;
-@@ -681,12 +682,15 @@ __mod_timer(struct timer_list *timer, unsigned long expires,
+@@ -681,12 +682,15 @@ __mod_timer(struct timer_list *timer, un
  
  	debug_activate(timer, expires);
  
@@ -55,7 +51,7 @@
  	new_base = per_cpu(tvec_bases, cpu);
  
  	if (base != new_base) {
-@@ -887,6 +891,29 @@ void add_timer_on(struct timer_list *timer, int cpu)
+@@ -887,6 +891,29 @@ void add_timer_on(struct timer_list *tim
  }
  EXPORT_SYMBOL_GPL(add_timer_on);
  
@@ -94,7 +90,7 @@
  /**
   * del_timer_sync - deactivate a timer and wait for the handler to finish.
   * @timer: the timer to be deactivated
-@@ -1015,7 +1042,7 @@ int del_timer_sync(struct timer_list *timer)
+@@ -1015,7 +1042,7 @@ int del_timer_sync(struct timer_list *ti
  		int ret = try_to_del_timer_sync(timer);
  		if (ret >= 0)
  			return ret;
@@ -103,7 +99,7 @@
  	}
  }
  EXPORT_SYMBOL(del_timer_sync);
-@@ -1126,10 +1153,11 @@ static inline void __run_timers(struct tvec_base *base)
+@@ -1126,10 +1153,11 @@ static inline void __run_timers(struct t
  
  			spin_unlock_irq(&base->lock);
  			call_timer_fn(timer, fn, data);
@@ -116,11 +112,11 @@
  	spin_unlock_irq(&base->lock);
  }
  
-@@ -1636,6 +1664,7 @@ static int __cpuinit init_timers_cpu(int cpu)
- 	}
- 
- 	spin_lock_init(&base->lock);
-+	init_waitqueue_head(&base->wait_for_running_timer);
- 
- 	for (j = 0; j < TVN_SIZE; j++) {
- 		INIT_LIST_HEAD(base->tv5.vec + j);
+@@ -1631,6 +1659,7 @@ static int __cpuinit init_timers_cpu(int
+ 			base = &boot_tvec_bases;
+ 		}
+ 		spin_lock_init(&base->lock);
++		init_waitqueue_head(&base->wait_for_running_timer);
+ 		tvec_base_done[cpu] = 1;
+ 	} else {
+ 		base = per_cpu(tvec_bases, cpu);

Modified: dists/wheezy/linux/debian/patches/series-rt
==============================================================================
--- dists/wheezy/linux/debian/patches/series-rt	Wed Jun  5 03:43:11 2013	(r20200)
+++ dists/wheezy/linux/debian/patches/series-rt	Wed Jun  5 04:05:14 2013	(r20201)
@@ -301,7 +301,6 @@
 features/all/rt/0301-wait-simple-Simple-waitqueue-implementation.patch
 features/all/rt/0302-rcutiny-Use-simple-waitqueue.patch
 features/all/rt/0303-rcutiny-Fix-typo-of-using-swake_up-instead-of-swait_.patch
-features/all/rt/0304-tcp-force-a-dst-refcount-when-prequeue-packet.patch
 features/all/rt/0305-x86-mce-Defer-mce-wakeups-to-threads-for-PREEMPT_RT.patch
 features/all/rt/0306-swap-Use-unique-local-lock-name-for-swap_lock.patch
 features/all/rt/0307-sched-Add-is_idle_task-to-handle-invalidated-uses-of.patch