| Message ID | 50A1A7BA.5000507@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
Shan Wei said, at 2012/11/13 9:51: > From: Shan Wei <davidshan@tencent.com> > > flush_tasklet is a struct, not a pointer in percpu var. > so use this_cpu_ptr to get the member pointer. > > Signed-off-by: Shan Wei <davidshan@tencent.com> > Reviewed-by: Christoph Lameter <cl@linux.com> David Miller, would you like to pick it up to your net-next tree? > --- > no changes vs v3. > --- > net/core/flow.c | 4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/net/core/flow.c b/net/core/flow.c > index e318c7e..b0901ee 100644 > --- a/net/core/flow.c > +++ b/net/core/flow.c > @@ -327,11 +327,9 @@ static void flow_cache_flush_tasklet(unsigned long data) > static void flow_cache_flush_per_cpu(void *data) > { > struct flow_flush_info *info = data; > - int cpu; > struct tasklet_struct *tasklet; > > - cpu = smp_processor_id(); > - tasklet = &per_cpu_ptr(info->cache->percpu, cpu)->flush_tasklet; > + tasklet = this_cpu_ptr(&info->cache->percpu->flush_tasklet); > tasklet->data = (unsigned long)info; > tasklet_schedule(tasklet); > } > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Shan Wei <shanwei88@gmail.com> Date: Fri, 16 Nov 2012 16:38:01 +0800 > Shan Wei said, at 2012/11/13 9:51: >> From: Shan Wei <davidshan@tencent.com> >> >> flush_tasklet is a struct, not a pointer in percpu var. >> so use this_cpu_ptr to get the member pointer. >> >> Signed-off-by: Shan Wei <davidshan@tencent.com> >> Reviewed-by: Christoph Lameter <cl@linux.com> > > David Miller, would you like to pick it up to your net-next tree? Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/core/flow.c b/net/core/flow.c index e318c7e..b0901ee 100644 --- a/net/core/flow.c +++ b/net/core/flow.c @@ -327,11 +327,9 @@ static void flow_cache_flush_tasklet(unsigned long data) static void flow_cache_flush_per_cpu(void *data) { struct flow_flush_info *info = data; - int cpu; struct tasklet_struct *tasklet; - cpu = smp_processor_id(); - tasklet = &per_cpu_ptr(info->cache->percpu, cpu)->flush_tasklet; + tasklet = this_cpu_ptr(&info->cache->percpu->flush_tasklet); tasklet->data = (unsigned long)info; tasklet_schedule(tasklet); }