Re: [PATCH] nvram: Fix missing smp_lock.h in nvram

[John Kacur]

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.

On Wed, Dec 9, 2009 at 6:44 PM, Frederic Weisbecker <fweisbec@xxxxxxxxx> 
wrote:
> 2009/12/6, Thomas Gleixner <tglx@xxxxxxxxxxxxx>:
> > Linus,
> >
> > Please pull the latest bkl-drivers-for-linus git tree from:
> >
> >    git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git
> > bkl-drivers-for-linus
> >
> > Thanks,
> >
> >       tglx
> >
> > ------------------>
> > Frederic Weisbecker (3):
> >       mem_class: Drop the bkl from memory_open()
> >       nvram: Drop the bkl from nvram_llseek()
> 
> 
> This breaks the upstream tree. It looks like a patch from Ingo
> that removed the bkl in nvram_open() is missing.
> 
> Please consider the following patch:
> 
> From 4ce046f911b1cb62b4e952fd599e0d8c3dcd8703 Mon Sep 17 00:00:00 2001
> From: Frederic Weisbecker <fweisbec@xxxxxxxxx>
> Date: Wed, 9 Dec 2009 18:31:53 +0100
> Subject: [PATCH] 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@xxxxxxxxx>
> ---
>  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 2100a8f..4008e2c 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>
> 
> --
> 1.6.2.3
> --

Ingo's patch was just probably just misplaced, I'd rather that we
resubmit it than put back smp_lock.h

Plus I have a follow-up one that converts nvram_ioctl to unlocked_ioctl.