drivers/char/nvram.c: Undo removal of duplicated include
PATCH 1/1 drivers/char/nvram.c: Undo removal of duplicated include
elesueur@bitburger:/usr/src/linux-2.6-git$ make CHK include/linux/version.h CHK include/linux/utsrelease.h SYMLINK include/asm -> include/asm-x86 CALL scripts/checksyscalls.sh CHK include/linux/compile.h CC drivers/char/consolemap_deftbl.o CC drivers/char/defkeymap.o LD drivers/char/built-in.o CC [M] drivers/char/nvram.o drivers/char/nvram.c: In function 'nvram_open': drivers/char/nvram.c:332: error: implicit declaration of function 'lock_kernel' drivers/char/nvram.c:339: error: implicit declaration of function 'unlock_kernel' make[2]: *** [drivers/char/nvram.o] Error 1 make[1]: *** [drivers/char] Error 2 make: *** [drivers] Error 2
a check shows commit id: 4d8f54d9e4323baae8c8ca753db91563f4b34ddb removed a 'duplicated include' which I believe is erroneous.
drivers/char/nvram.c +1 -0
@@ -38,6 +38,7 @@#define NVRAM_VERSION "1.3"#include <linux/module.h> +#include <linux/smp_lock.h> #include <linux/nvram.h> #define PC 1
Regards,
Etienne Le Sueur
www.ertos.nicta.com.au
Hi Etienne,
Quoted 30 lines · Etienne Le Sueur
elesueur@bitburger:/usr/src/linux-2.6-git$ make CHK include/linux/version.h CHK include/linux/utsrelease.h SYMLINK include/asm -> include/asm-x86 CALL scripts/checksyscalls.sh CHK include/linux/compile.h CC drivers/char/consolemap_deftbl.o CC drivers/char/defkeymap.o LD drivers/char/built-in.o CC [M] drivers/char/nvram.o drivers/char/nvram.c: In function 'nvram_open': drivers/char/nvram.c:332: error: implicit declaration of function 'lock_kernel' drivers/char/nvram.c:339: error: implicit declaration of function 'unlock_kernel' make[2]: *** [drivers/char/nvram.o] Error 1 make[1]: *** [drivers/char] Error 2 make: *** [drivers] Error 2a check shows commit id:
4d8f54d9e4323baae8c8ca753db91563f4b34ddbremoved a 'duplicated include' which I believe is erroneous.drivers/char/nvram.c +0
-0
drivers/char/nvram.c line 44
Quoted 7 lines
drivers/char/nvram.c +1
-0@@ -38,6 +38,7 @@#define NVRAM_VERSION "1.3"#include <linux/module.h> +#include <linux/smp_lock.h> #include <linux/nvram.h> #define PC 1
Your patch got corrupted so it won't apply.
Anyway it seems this build error is already fixed upstream:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=79a56ed0e11c7d924762062a0e2a46b87014498d
Signature · 1 line
Jean Delvare