diff options
| author |   Frederic Weisbecker <fweisbec@gmail.com> | 2009-12-09 18:31:53 +0100 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 18:53:23 -0800 |
| commit | 79a56ed0e11c7d924762062a0e2a46b87014498d (patch) | |
| tree | 08e2cb925f85dd691fbc4b90f77b7018c67d2010 /drivers/char/nvram.c | |
| parent | Merge branch 'bkl-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (diff) | |
| download | linux-dev-79a56ed0e11c7d924762062a0e2a46b87014498d.tar.xz linux-dev-79a56ed0e11c7d924762062a0e2a46b87014498d.zip | |
nvram: Fix missing smp_lock.h in nvram
The bkl has been removed from nvram_llseek() and smp_lock.h was removed
because another patch in the same tree zapped the remaining usage of bkl
in the same file. But this patch must have been excluded later, then we
still need the smp_lock.h headers for the bkl use in nvram_open().
This fixes the following build error:
drivers/char/nvram.c: In function ‘nvram_open’:
drivers/char/nvram.c:332: erreur: implicit declaration of function ‘lock_kernel’
drivers/char/nvram.c:339: erreur: implicit declaration of function ‘unlock_kernel’
make[2]: *** [drivers/char/nvram.o] Erreur 1
make[1]: *** [drivers/char] Erreur 2
make: *** [drivers] Erreur 2
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/nvram.c')
| -rw-r--r-- | drivers/char/nvram.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c index 2100a8f7bd86..4008e2ce73c1 100644 --- a/drivers/char/nvram.c +++ b/drivers/char/nvram.c @@ -110,6 +110,7 @@ #include <linux/spinlock.h> #include <linux/io.h> #include <linux/uaccess.h> +#include <linux/smp_lock.h> #include <asm/system.h> |