RT: Update to PREEMPT_RT 4.4.38-rt49
Update the PREEMPT_RT patch series to 4.4.38-rt49
to match kernel point release.
Bug 200259045
Change-Id: Ic6737b22b9047ecb3c148e982551300f536fc791
Signed-off-by: Ishan Mittal <imittal@nvidia.com>
Reviewed-on: http://git-master/r/1280758
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
diff --git a/rt-patches/0169-net-Use-cpu_chill-instead-of-cpu_relax.patch b/rt-patches/0169-net-Use-cpu_chill-instead-of-cpu_relax.patch
index 05e9215..000f41a 100644
--- a/rt-patches/0169-net-Use-cpu_chill-instead-of-cpu_relax.patch
+++ b/rt-patches/0169-net-Use-cpu_chill-instead-of-cpu_relax.patch
@@ -1,8 +1,7 @@
-From 59eb56d210e3831cc9d320b80f3306236c611594 Mon Sep 17 00:00:00 2001
+From d81e3956bf50e3e0c97f7b20294c58a4907bce71 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 7 Mar 2012 21:10:04 +0100
-Subject: [PATCH 169/351] net: Use cpu_chill() instead of cpu_relax()
-X-NVConfidentiality: public
+Subject: [PATCH 169/365] net: Use cpu_chill() instead of cpu_relax()
Retry loops on RT might loop forever when the modifying side was
preempted. Use cpu_chill() instead of cpu_relax() to let the system
@@ -15,7 +14,7 @@
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
-index 9cc7b512b472..528941b8a54d 100644
+index f223d1c..30f074a 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -63,6 +63,7 @@
@@ -26,7 +25,7 @@
#include <linux/kmod.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
-@@ -695,7 +696,7 @@ static void prb_retire_rx_blk_timer_expired(unsigned long data)
+@@ -694,7 +695,7 @@ static void prb_retire_rx_blk_timer_expired(unsigned long data)
if (BLOCK_NUM_PKTS(pbd)) {
while (atomic_read(&pkc->blk_fill_in_prog)) {
/* Waiting for skb_copy_bits to finish... */
@@ -35,7 +34,7 @@
}
}
-@@ -957,7 +958,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc,
+@@ -956,7 +957,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc,
if (!(status & TP_STATUS_BLK_TMO)) {
while (atomic_read(&pkc->blk_fill_in_prog)) {
/* Waiting for skb_copy_bits to finish... */
@@ -45,7 +44,7 @@
}
prb_close_block(pkc, pbd, po, status);
diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
-index a2340748ec86..19123a97b354 100644
+index a234074..19123a9 100644
--- a/net/rds/ib_rdma.c
+++ b/net/rds/ib_rdma.c
@@ -34,6 +34,7 @@
@@ -66,5 +65,5 @@
}
--
-2.10.1
+2.7.4