2.5.6 PPP deflate breakage on UP
PATCH 1/1 2.5.6 PPP deflate breakage on UP
In kernel 2.5.6, PPP deflate isn't compiled correctly if CONFIG_SMP is off: the macros local_bh_enable() and local_bh_disable() aren't expanded and instead turn into references to undefined functions. The problem is that <linux/smp_lock.h> is insufficient in UP configs.
The patch below adds an #include <linux/interrupt.h> which works around this. I'm not sure about <linux/smp_lock.h>: it really doesn't look appropriate for the locking primitives being used in ppp_deflate.c.
/Mikael
drivers/net/ppp_deflate.c renamed from drivers/net/ppp_deflate.c.~1~ +1 -0
@@ -35,6 +35,7 @@#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/smp_lock.h> #include <linux/ppp_defs.h>
Quoted 4 lines · [email protected] said:
The patch below adds an #include <
linux/interrupt.h> which works
around this. I'm not sure about <linux/smp_lock.h>: it really doesn't look appropriate for the locking primitives being used inppp_deflate.c.
You're right - it can go.
In fact, I think the whole delayed-vfree thing can be dropped in davej's tree and fed to Linus when the PPP locking changes are.
--
dwmw2
The following patch also works, but may not be the most elegant in the world.
ppp_deflate.c renamed from ppp_deflate.c.orig +2 -0
@@ -41,6 +41,8 @@#include <linux/ppp-comp.h> #include <linux/zlib.h> +#include <asm/softirq.h> +extern asmlinkage void do_softirq();static spinlock_t comp_free_list_lock =SPIN_LOCK_UNLOCKED ;static LIST_HEAD (comp_free_list);
Quoted 26 lines · on Sun, 10 Mar 2002 17:43:43 +0100 (MET) Mikael Pettersson <[email protected]>…
In kernel 2.5.6, PPP deflate isn't compiled correctly if
CONFIG_SMPis off: the macroslocal_bh_enable()andlocal_bh_disable()aren't expanded and instead turn into references to undefined functions. The problem is that <linux/smp_lock.h> is insufficient in UP configs.The patch below adds an #include <
linux/interrupt.h> which works around this. I'm not sure about <linux/smp_lock.h>: it really doesn't look appropriate for the locking primitives being used inppp_deflate.c./Mikael
drivers/net/ppp_deflate.c renamed from drivers/net/ppp_deflate.c.~1~ +1
-1@@ -35,6 +35,7 @@#include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/init.h> +#include <linux/interrupt.h> #include <linux/smp_lock.h> #include <linux/ppp_defs.h> -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 2 lines
John Covici
[email protected]