Re: 2.6.11-rc1-mm2

[Christoph Hellwig]

On Thu, Jan 20, 2005 at 10:57:09AM +0100, Steffen Klassert wrote:
> On Wed, Jan 19, 2005 at 09:38:18PM -0800 or thereabouts, Andrew Morton wrote:
> 
> > +kill-softirq_pending.patch
> > 
> >  Remove softirq_pending().  This breaks net/core/pktgen.c.
> 
> net/built-in.o: In function `pktgen_thread_worker':
> /usr/src/linux-2.6.11-rc1-mm2/net/core/pktgen.c:2809: undefined reference to `softirq_pending'
> make: *** [.tmp_vmlinux1] Error 1
> 
> The patch below is a compile fix.
> 
> Signed-off-by: Steffen Klassert <klassert@xxxxxxxxxxxxxxxxxxxxxxxxx>
> 
> --- vanilla-2.6.11-rc1-mm2/net/core/pktgen.c	Thu Jan 20 10:30:12 2005
> +++ linux-2.6.11-rc1-mm2/net/core/pktgen.c	Thu Jan 20 10:26:03 2005
> @@ -2806,7 +2806,7 @@
>  			tx_since_softirq += pkt_dev->last_ok;
>  
>  			if (tx_since_softirq > max_before_softirq) {
> -				if(softirq_pending(smp_processor_id()))  
> +				if(local_softirq_pending())  

That patch is fine, thanks.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/