[kernel] r18799 - in dists/sid/linux-2.6/debian: . patches/features/all/rt
Uwe Kleine-König
ukleinek-guest at alioth.debian.org
Tue Mar 6 14:25:28 UTC 2012
Author: ukleinek-guest
Date: Tue Mar 6 14:25:26 2012
New Revision: 18799
Log:
[rt] bump rt patch to version 3.2.9-rt16
This includes the locking fix for offlining a CPU commited earlier.
Modified:
dists/sid/linux-2.6/debian/changelog
dists/sid/linux-2.6/debian/patches/features/all/rt/cpu-rt-make-hotplug-lock-a-sleeping-spinlock-on-rt.patch
dists/sid/linux-2.6/debian/patches/features/all/rt/localversion.patch
dists/sid/linux-2.6/debian/patches/features/all/rt/seqlock-prevent-rt-starvation.patch
Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog Tue Mar 6 08:29:22 2012 (r18798)
+++ dists/sid/linux-2.6/debian/changelog Tue Mar 6 14:25:26 2012 (r18799)
@@ -1,6 +1,6 @@
linux-2.6 (3.2.9-2) UNRELEASED; urgency=low
- * [rt] fix locking when taking down a CPU
+ * [rt] bump rt patch to version 3.2.9-rt16
-- Uwe Kleine-König <u.kleine-koenig at pengutronix.de> Tue, 06 Mar 2012 09:26:00 +0100
Modified: dists/sid/linux-2.6/debian/patches/features/all/rt/cpu-rt-make-hotplug-lock-a-sleeping-spinlock-on-rt.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/rt/cpu-rt-make-hotplug-lock-a-sleeping-spinlock-on-rt.patch Tue Mar 6 08:29:22 2012 (r18798)
+++ dists/sid/linux-2.6/debian/patches/features/all/rt/cpu-rt-make-hotplug-lock-a-sleeping-spinlock-on-rt.patch Tue Mar 6 14:25:26 2012 (r18799)
@@ -19,12 +19,13 @@
Link: http://lkml.kernel.org/r/1330702617.25686.265.camel@gandalf.stny.rr.com
Signed-off-by: Thomas Gleixner <tglx at linutronix.de>
---
-[ukleinek: squash in an obvious fix by Steven Rostedt
- id:1330985640.25686.342.camel at gandalf.stny.rr.com]
-diff --git a/kernel/cpu.c b/kernel/cpu.c
-index fa40834..66dfb74 100644
---- a/kernel/cpu.c
-+++ b/kernel/cpu.c
+ kernel/cpu.c | 35 ++++++++++++++++++++++++++---------
+ 1 file changed, 26 insertions(+), 9 deletions(-)
+
+Index: linux-3.2/kernel/cpu.c
+===================================================================
+--- linux-3.2.orig/kernel/cpu.c
++++ linux-3.2/kernel/cpu.c
@@ -46,7 +46,12 @@ static int cpu_hotplug_disabled;
static struct {
@@ -61,7 +62,7 @@
struct hotplug_pcp {
struct task_struct *unplug;
int refcount;
-@@ -87,8 +100,8 @@ retry:
+@@ -87,8 +104,8 @@ retry:
return;
}
preempt_enable();
@@ -72,7 +73,7 @@
preempt_disable();
goto retry;
}
-@@ -161,9 +174,9 @@ void get_online_cpus(void)
+@@ -161,9 +178,9 @@ void get_online_cpus(void)
might_sleep();
if (cpu_hotplug.active_writer == current)
return;
@@ -84,7 +85,7 @@
}
EXPORT_SYMBOL_GPL(get_online_cpus);
-@@ -172,10 +185,10 @@ void put_online_cpus(void)
+@@ -172,10 +189,10 @@ void put_online_cpus(void)
{
if (cpu_hotplug.active_writer == current)
return;
@@ -97,7 +98,7 @@
}
EXPORT_SYMBOL_GPL(put_online_cpus);
-@@ -207,11 +220,11 @@ static void cpu_hotplug_begin(void)
+@@ -207,11 +224,11 @@ static void cpu_hotplug_begin(void)
cpu_hotplug.active_writer = current;
for (;;) {
@@ -111,7 +112,7 @@
schedule();
}
}
-@@ -219,7 +232,7 @@ static void cpu_hotplug_begin(void)
+@@ -219,7 +236,7 @@ static void cpu_hotplug_begin(void)
static void cpu_hotplug_done(void)
{
cpu_hotplug.active_writer = NULL;
@@ -120,7 +121,3 @@
}
#else /* #if CONFIG_HOTPLUG_CPU */
-
-
-
-
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 6 08:29:22 2012 (r18798)
+++ dists/sid/linux-2.6/debian/patches/features/all/rt/localversion.patch Tue Mar 6 14:25:26 2012 (r18799)
@@ -14,4 +14,4 @@
--- /dev/null
+++ linux-3.2/localversion-rt
@@ -0,0 +1 @@
-+-rt15
++-rt16
Modified: dists/sid/linux-2.6/debian/patches/features/all/rt/seqlock-prevent-rt-starvation.patch
==============================================================================
--- dists/sid/linux-2.6/debian/patches/features/all/rt/seqlock-prevent-rt-starvation.patch Tue Mar 6 08:29:22 2012 (r18798)
+++ dists/sid/linux-2.6/debian/patches/features/all/rt/seqlock-prevent-rt-starvation.patch Tue Mar 6 14:25:26 2012 (r18799)
@@ -14,7 +14,8 @@
---
include/linux/seqlock.h | 23 +++++++++++++++++++++++
- 1 file changed, 23 insertions(+)
+ include/net/neighbour.h | 2 +-
+ 2 files changed, 24 insertions(+), 1 deletion(-)
Index: linux-3.2/include/linux/seqlock.h
===================================================================
@@ -24,7 +25,7 @@
/*
* Read side functions for starting and finalizing a read side section.
*/
-+#ifndef CONFIG_PREEMPT_RT
++#ifndef CONFIG_PREEMPT_RT_FULL
static inline unsigned read_seqbegin(const seqlock_t *sl)
{
return read_seqcount_begin(&sl->seqcount);
@@ -54,3 +55,16 @@
static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
{
+Index: linux-3.2/include/net/neighbour.h
+===================================================================
+--- linux-3.2.orig/include/net/neighbour.h
++++ linux-3.2/include/net/neighbour.h
+@@ -385,7 +385,7 @@ struct neighbour_cb {
+
+ #define NEIGH_CB(skb) ((struct neighbour_cb *)(skb)->cb)
+
+-static inline void neigh_ha_snapshot(char *dst, const struct neighbour *n,
++static inline void neigh_ha_snapshot(char *dst, struct neighbour *n,
+ const struct net_device *dev)
+ {
+ unsigned int seq;
More information about the Kernel-svn-changes
mailing list