| From de2d0e83420c2afcbf0447f9ab4452724aa2cfc6 Mon Sep 17 00:00:00 2001 |
| From: Steven Rostedt <srostedt@redhat.com> |
| Date: Fri, 3 Jul 2009 08:44:28 -0500 |
| Subject: [PATCH] net: suppress warning of smp_processor_id use. |
| |
| commit 7e6a731d1e5896d498dd4f69b2920d66de9952ec in tip. |
| |
| John Kacur pointed out that the get_cpu_var used in net/sched/sch_generic.c |
| would trigger warnings. This was happing on a statistic variable and |
| by a softirq which is bound to a single thread. |
| |
| John sent a patch that used local_irq_save which is a little bit of |
| overkill. This version uses preempt disable, but we still need to create |
| a preempt_disable_rt API that is only activated when PREEMPT_RT is configured. |
| |
| Signed-off-by: Steven Rostedt <srostedt@redhat.com> |
| Signed-off-by: Ingo Molnar <mingo@elte.hu> |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| net/sched/sch_generic.c | 2 ++ |
| 1 files changed, 2 insertions(+), 0 deletions(-) |
| |
| diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c |
| index 47834d8..e406917 100644 |
| --- a/net/sched/sch_generic.c |
| +++ b/net/sched/sch_generic.c |
| @@ -96,7 +96,9 @@ static inline int handle_dev_cpu_collision(struct sk_buff *skb, |
| * Another cpu is holding lock, requeue & delay xmits for |
| * some time. |
| */ |
| + preempt_disable(); /* FIXME: we need an _rt version of this */ |
| __get_cpu_var(netdev_rx_stat).cpu_collision++; |
| + preempt_enable(); |
| ret = dev_requeue_skb(skb, q); |
| } |
| |
| -- |
| 1.7.0.4 |
| |
