[PATCH] drivers/char/nvram.c: Undo removal of duplicated include

[PATCH] drivers/char/nvram.c: Undo removal of duplicated include

[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 2

a check shows commit id: 4d8f54d9e4323baae8c8ca753db91563f4b34ddb 
removed a 'duplicated include' which I believe is erroneous.




diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
index 2100a8f..3cfa0f6 100644
--- a/drivers/char/nvram.c
+++ b/drivers/char/nvram.c
@@ -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

Re: [PATCH] drivers/char/nvram.c: Undo removal of duplicated include

[Jean Delvare]

Hi Etienne,

On Thu, 10 Dec 2009 13:04:53 +1100, Etienne Le Sueur wrote:
> 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.
> 
> 
> 
> 
> diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c
> index 2100a8f..3cfa0f6 100644
> --- a/drivers/char/nvram.c
> +++ b/drivers/char/nvram.c
> @@ -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

-- 
Jean Delvare