2.1.10-2.6.20.7-200704241759 vs. 2.6.20.13

[nkukard]

Any quick fix for this error when applying grsecurity-2.1.10-2.6.20.7-200704241759.patch to 2.6.20.13?

In file included from include/asm/current.h:5,
from drivers/media/video/pwc/pwc-uncompress.c:30:
include/asm/pda.h:21: error: 'NR_CPUS' undeclared here (not in a function)
make[4]: *** [drivers/media/video/pwc/pwc-uncompress.o] Error 1
make[3]: *** [drivers/media/video/pwc] Error 2
make[2]: *** [drivers/media/video] Error 2
make[1]: *** [drivers/media] Error 2
make: *** [drivers] Error 2


Kind Regards
Nigel

[harrygittens]

do you need philips web cam?

if not unselect CONFIG_USB_PWC

[Alexei.Sheplyakov]

Any quick fix for this error when applying
grsecurity-2.1.10-2.6.20.7-200704241759.patch to 2.6.20.13?

In file included from include/asm/current.h:5,
from drivers/media/video/pwc/pwc-uncompress.c:30:
include/asm/pda.h:21: error: 'NR_CPUS' undeclared here (not in a function)
make[4]: *** [drivers/media/video/pwc/pwc-uncompress.o] Error 1
make[3]: *** [drivers/media/video/pwc] Error 2
make[2]: *** [drivers/media/video] Error 2
make[1]: *** [drivers/media] Error 2
make: *** [drivers] Error 2

I don't think this has anything to do with grsecurity. Anyway, here
is a simple one-liner:

Index: linux-2.6.20.7/drivers/media/video/pwc/pwc-uncompress.c
===================================================================
--- linux-2.6.20.7.orig/drivers/media/video/pwc/pwc-uncompress.c 2007-04-15 19:33:14.000000000 +0400
+++ linux-2.6.20.7/drivers/media/video/pwc/pwc-uncompress.c 2007-04-15 19:33:55.000000000 +0400
@@ -26,6 +26,7 @@
vim: set ts=8:
*/

+#include <linux/threads.h>
#include <asm/current.h>
#include <asm/types.h>


I don't own the hardware, so I can't check if it works. But at least it
compiles, and module can be inserted.