diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-05-07 19:03:11 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-05-07 19:03:11 -0400 |
| commit | 046cbd132f63aa77f1e4e6338798eb2014e43705 (patch) | |
| tree | 94040a943694e4a970d4d00ede6fb3253eb05190 | |
| parent | bd1969578d5d1636501d100b2251c65718aa03be (diff) | |
| download | 3.8-rt-patches-046cbd132f63aa77f1e4e6338798eb2014e43705.tar.gz | |
patches-3.8.9-rt3.tar.xzv3.8.9-rt3
md5sum:
efe0b0d8f2304b271b8869817e8b7e1f patches-3.8.9-rt3.tar.xz
No announce.
https://www.kernel.org/pub/linux/kernel/projects/rt/3.8/older/patches-3.8.9-rt3.tar.xz
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | patches/localversion.patch | 2 | ||||
| -rw-r--r-- | patches/softirq-preempt-fix-3-re.patch | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/patches/localversion.patch b/patches/localversion.patch index 2f31c4f..45dd8dd 100644 --- a/patches/localversion.patch +++ b/patches/localversion.patch @@ -12,4 +12,4 @@ Link: http://lkml.kernel.org/n/tip-8vdw4bfcsds27cvox6rpb334@git.kernel.org --- /dev/null +++ b/localversion-rt @@ -0,0 +1 @@ -+-rt2 ++-rt3 diff --git a/patches/softirq-preempt-fix-3-re.patch b/patches/softirq-preempt-fix-3-re.patch index 85b8188..c5e4d2f 100644 --- a/patches/softirq-preempt-fix-3-re.patch +++ b/patches/softirq-preempt-fix-3-re.patch @@ -85,17 +85,17 @@ Cc: stable-rt@vger.kernel.org #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) +@@ -111,6 +113,7 @@ do { \ + #define preempt_disable_notrace() barrier() + #define preempt_enable_no_resched_notrace() barrier() + #define preempt_enable_notrace() barrier() ++#define preempt_check_resched_rt() do { } while (0) #endif /* CONFIG_PREEMPT_COUNT */ --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -1946,6 +1946,7 @@ static inline void __netif_reschedule(st +@@ -1945,6 +1945,7 @@ static inline void __netif_reschedule(st sd->output_queue_tailp = &q->next_sched; raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_restore(flags); @@ -103,7 +103,7 @@ Cc: stable-rt@vger.kernel.org } void __netif_schedule(struct Qdisc *q) -@@ -1967,6 +1968,7 @@ void dev_kfree_skb_irq(struct sk_buff *s +@@ -1966,6 +1967,7 @@ void dev_kfree_skb_irq(struct sk_buff *s sd->completion_queue = skb; raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_restore(flags); @@ -111,7 +111,7 @@ Cc: stable-rt@vger.kernel.org } } EXPORT_SYMBOL(dev_kfree_skb_irq); -@@ -3052,6 +3054,7 @@ enqueue: +@@ -3051,6 +3053,7 @@ enqueue: rps_unlock(sd); local_irq_restore(flags); @@ -119,7 +119,7 @@ Cc: stable-rt@vger.kernel.org atomic_long_inc(&skb->dev->rx_dropped); kfree_skb(skb); -@@ -3932,6 +3935,7 @@ static void net_rps_action_and_irq_enabl +@@ -3937,6 +3940,7 @@ static void net_rps_action_and_irq_enabl } else #endif local_irq_enable(); @@ -127,7 +127,7 @@ Cc: stable-rt@vger.kernel.org } static int process_backlog(struct napi_struct *napi, int quota) -@@ -4004,6 +4008,7 @@ void __napi_schedule(struct napi_struct +@@ -4009,6 +4013,7 @@ void __napi_schedule(struct napi_struct local_irq_save(flags); ____napi_schedule(&__get_cpu_var(softnet_data), n); local_irq_restore(flags); @@ -135,7 +135,7 @@ Cc: stable-rt@vger.kernel.org } EXPORT_SYMBOL(__napi_schedule); -@@ -6560,6 +6565,7 @@ static int dev_cpu_callback(struct notif +@@ -6565,6 +6570,7 @@ static int dev_cpu_callback(struct notif raise_softirq_irqoff(NET_TX_SOFTIRQ); local_irq_enable(); |