[kernel] r18861 - in dists/sid/linux-2.6/debian: . patches/features/all/rt

[Ben Hutchings]

Author: benh
Date: Tue Mar 20 03:35:24 2012
New Revision: 18861

Log:
[rt] bump rt patch to version 3.2.11-rt20

Deleted:
   dists/sid/linux-2.6/debian/patches/features/all/rt/genirq-clear-thread-mask-for-non-oneshot.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/features/all/rt/localversion.patch
   dists/sid/linux-2.6/debian/patches/features/all/rt/series
   dists/sid/linux-2.6/debian/patches/features/all/rt/softirq-preempt-fix-3-re.txt

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Tue Mar 20 03:18:49 2012	(r18860)
+++ dists/sid/linux-2.6/debian/changelog	Tue Mar 20 03:35:24 2012	(r18861)
@@ -22,6 +22,7 @@
   * [x86] Disable POHMELFS; this version is obsolete
   * epoll: Don't limit non-nested epoll paths
   * CIFS: Fix a spurious error in cifs_push_posix_locks
+  * [rt] bump rt patch to version 3.2.11-rt20
 
   [ Jonathan Nieder ]
   * [x86] Enable RTS5139 as module (Closes: #663912)

Modified: dists/sid/linux-2.6/debian/patches/features/all/rt/localversion.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/rt/localversion.patch	Tue Mar 20 03:18:49 2012	(r18860)
+++ dists/sid/linux-2.6/debian/patches/features/all/rt/localversion.patch	Tue Mar 20 03:35:24 2012	(r18861)
@@ -14,4 +14,4 @@
 --- /dev/null
 +++ linux-3.2/localversion-rt
 @@ -0,0 +1 @@
-+-rt17
++-rt20

Modified: dists/sid/linux-2.6/debian/patches/features/all/rt/series
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/rt/series	Tue Mar 20 03:18:49 2012	(r18860)
+++ dists/sid/linux-2.6/debian/patches/features/all/rt/series	Tue Mar 20 03:35:24 2012	(r18861)
@@ -5,7 +5,7 @@
 ############################################################
 # UPSTREAM changes queued for 3.3 or 3.2
 ############################################################
-genirq-clear-thread-mask-for-non-oneshot.patch
+x88-derandom-tsc-delay-64-bit.patch
 x86_64-patch-for-idle-notifiers.patch
 re-possible-slab-deadlock-while-doing-ifenslave-1.patch
 

Modified: dists/sid/linux-2.6/debian/patches/features/all/rt/softirq-preempt-fix-3-re.txt
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/rt/softirq-preempt-fix-3-re.txt	Tue Mar 20 03:18:49 2012	(r18860)
+++ dists/sid/linux-2.6/debian/patches/features/all/rt/softirq-preempt-fix-3-re.txt	Tue Mar 20 03:35:24 2012	(r18861)
@@ -16,9 +16,9 @@
 ---
  block/blk-iopoll.c      |    3 +++
  block/blk-softirq.c     |    3 +++
- include/linux/preempt.h |    2 ++
+ include/linux/preempt.h |    3 +++
  net/core/dev.c          |    6 ++++++
- 4 files changed, 14 insertions(+)
+ 4 files changed, 15 insertions(+)
 
 Index: linux-3.2/block/blk-iopoll.c
 ===================================================================
@@ -91,6 +91,14 @@
  #endif
  
  #define preempt_enable() \
+@@ -105,6 +107,7 @@ do { \
+ #define preempt_disable_notrace()		do { } while (0)
+ #define preempt_enable_no_resched_notrace()	do { } while (0)
+ #define preempt_enable_notrace()		do { } while (0)
++#define preempt_check_resched_rt()	do { } while (0)
+ 
+ #endif /* CONFIG_PREEMPT_COUNT */
+ 
 Index: linux-3.2/net/core/dev.c
 ===================================================================
 --- linux-3.2.orig/net/core/dev.c