Messages in this thread | | | Date | Mon, 04 Oct 2004 22:52:28 +0100 | From | Grant Wilson <> | Subject | Re: 2.6.9-rc3-mm2 |
| |
Andrew Morton wrote: [snip]
> You could try these instead: > > --- 25/include/linux/netfilter_ipv4/ip_conntrack.h~conntrack-preempt-safety-fix Mon Oct 4 14:36:19 2004 > +++ 25-akpm/include/linux/netfilter_ipv4/ip_conntrack.h Mon Oct 4 14:37:02 2004 > @@ -311,10 +311,11 @@ struct ip_conntrack_stat > unsigned int expect_delete; > }; > > -#define CONNTRACK_STAT_INC(count) \ > - do { \ > - per_cpu(ip_conntrack_stat, get_cpu()).count++; \ > - put_cpu(); \ > +#define CONNTRACK_STAT_INC(count) \ > + do { \ > + preempt_disable(); \ > + per_cpu(ip_conntrack_stat, smp_processor_id()).count++; \ > + preempt_disable(); ^^^^^^^^^^^^^^^^^^ Should this not be preempt_enable(); ?
Cheers, Grant - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |