diff options
author | Li RongQing | 2013-03-27 18:42:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman | 2013-04-05 11:26:19 -0500 |
commit | 0f6c504f9d65d9febc7b4b03d5a1428757e99e9d (patch) | |
tree | 804b47761375ec715c0456c88d1d124103ca37d9 /net | |
parent | 4a2438e61cf83c3173766d77216b3dba25d65583 (diff) | |
download | kernel-audio-0f6c504f9d65d9febc7b4b03d5a1428757e99e9d.tar.gz kernel-audio-0f6c504f9d65d9febc7b4b03d5a1428757e99e9d.tar.xz kernel-audio-0f6c504f9d65d9febc7b4b03d5a1428757e99e9d.zip |
net: fix the use of this_cpu_ptr
[ Upstream commit 50eab0503a7579ada512e4968738b7c9737cf36e ]
flush_tasklet is not percpu var, and percpu is percpu var, and
this_cpu_ptr(&info->cache->percpu->flush_tasklet)
is not equal to
&this_cpu_ptr(info->cache->percpu)->flush_tasklet
1f743b076(use this_cpu_ptr per-cpu helper) introduced this bug.
Signed-off-by: Li RongQing <roy.qing.li@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/flow.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/flow.c b/net/core/flow.c index b0901ee5a002..3bad82461f33 100644 --- a/net/core/flow.c +++ b/net/core/flow.c | |||
@@ -329,7 +329,7 @@ static void flow_cache_flush_per_cpu(void *data) | |||
329 | struct flow_flush_info *info = data; | 329 | struct flow_flush_info *info = data; |
330 | struct tasklet_struct *tasklet; | 330 | struct tasklet_struct *tasklet; |
331 | 331 | ||
332 | tasklet = this_cpu_ptr(&info->cache->percpu->flush_tasklet); | 332 | tasklet = &this_cpu_ptr(info->cache->percpu)->flush_tasklet; |
333 | tasklet->data = (unsigned long)info; | 333 | tasklet->data = (unsigned long)info; |
334 | tasklet_schedule(tasklet); | 334 | tasklet_schedule(tasklet); |
335 | } | 335 | } |