diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-10-22 14:46:26 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-10-22 14:50:42 -0400 |
| commit | 508256cef28b0fb92aebc37c5b59c223bb1216e8 (patch) | |
| tree | 8f4e38637b5d75fd1d2f94255a4dfcd8af19c456 | |
| parent | 9e873ba457ffdf4e99fb73526f53b706679f1e9c (diff) | |
| download | 3.6-rt-patches-508256cef28b0fb92aebc37c5b59c223bb1216e8.tar.gz | |
patches-3.6.2-rt4.tar.xzv3.6.2-rt4
md5sum:
d5fb1ae0e79c3d175278b62856582e3c patches-3.6.2-rt4.tar.xz
Per the announce below, only change is softirq printk message
removal that was in rt3. The other two patches that appear here
in the diffstat are just context changes from patch refreshes
against the new 3.6.2 baseline.
Announce:
-------------------
Dear RT Folks,
I'm pleased to announce the 3.6.2-rt4 release. rt4 is just an update
to 3.6.2. The not announced 3.6.1-rt3 is an intermediate release with
a single change.
Changes since 3.6.1-rt2:
* Remove the softirq noise printk
The delta patch against 3.6.1-rt2 is appended below and can be found here
http://www.kernel.org/pub/linux/kernel/projects/rt/3.6/incr/patch-3.6.1-rt2-rt3.patch.xz
The RT patch against 3.6.2 can be found here:
http://www.kernel.org/pub/linux/kernel/projects/rt/3.6/patch-3.6.2-rt4.patch.xz
The split quilt queue is available at:
http://www.kernel.org/pub/linux/kernel/projects/rt/3.6/patches-3.6.2-rt4.tar.xz
Enjoy,
tglx
-------------------
http://marc.info/?l=linux-rt-users&m=135076204908119&w=2
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | drivers-net-fix-livelock-issues.patch | 8 | ||||
| -rw-r--r-- | localversion.patch | 2 | ||||
| -rw-r--r-- | sched-mmdrop-delayed.patch | 12 |
3 files changed, 10 insertions, 12 deletions
diff --git a/drivers-net-fix-livelock-issues.patch b/drivers-net-fix-livelock-issues.patch index f4946e2..e4bfc61 100644 --- a/drivers-net-fix-livelock-issues.patch +++ b/drivers-net-fix-livelock-issues.patch @@ -125,9 +125,9 @@ Index: linux-stable/drivers/net/rionet.c =================================================================== --- linux-stable.orig/drivers/net/rionet.c +++ linux-stable/drivers/net/rionet.c -@@ -176,11 +176,7 @@ static int rionet_start_xmit(struct sk_b - u16 destid; +@@ -178,11 +178,7 @@ static int rionet_start_xmit(struct sk_b unsigned long flags; + int add_num = 1; - local_irq_save(flags); - if (!spin_trylock(&rnet->tx_lock)) { @@ -136,5 +136,5 @@ Index: linux-stable/drivers/net/rionet.c - } + spin_lock_irqsave(&rnet->tx_lock, flags); - if ((rnet->tx_cnt + 1) > RIONET_TX_RING_SIZE) { - netif_stop_queue(ndev); + if (is_multicast_ether_addr(eth->h_dest)) + add_num = nact; diff --git a/localversion.patch b/localversion.patch index fbe434e..9972254 100644 --- a/localversion.patch +++ b/localversion.patch @@ -14,4 +14,4 @@ Index: linux-stable/localversion-rt --- /dev/null +++ linux-stable/localversion-rt @@ -0,0 +1 @@ -+-rt3 ++-rt4 diff --git a/sched-mmdrop-delayed.patch b/sched-mmdrop-delayed.patch index 67565fa..a007da9 100644 --- a/sched-mmdrop-delayed.patch +++ b/sched-mmdrop-delayed.patch @@ -10,8 +10,8 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> include/linux/mm_types.h | 4 ++++ include/linux/sched.h | 12 ++++++++++++ kernel/fork.c | 15 ++++++++++++++- - kernel/sched/core.c | 21 +++++++++++++++++++-- - 4 files changed, 49 insertions(+), 3 deletions(-) + kernel/sched/core.c | 19 +++++++++++++++++-- + 4 files changed, 47 insertions(+), 3 deletions(-) Index: linux-stable/include/linux/mm_types.h =================================================================== @@ -138,16 +138,14 @@ Index: linux-stable/kernel/sched/core.c } /* -@@ -5621,6 +5632,12 @@ migration_call(struct notifier_block *nf +@@ -5622,6 +5633,10 @@ migration_call(struct notifier_block *nf + case CPU_DEAD: calc_load_migrate(rq); - break; -+ case CPU_DEAD: + if (per_cpu(idle_last_mm, cpu)) { + mmdrop(per_cpu(idle_last_mm, cpu)); + per_cpu(idle_last_mm, cpu) = NULL; + } -+ break; + break; #endif } - |