Re: BKL: remove extraneous #include <smp_lock.h>

[Randy Dunlap <randy.dunlap@oracle.com>]

On 11/17/10 14:23, Linus Torvalds wrote:
> On Wed, Nov 17, 2010 at 2:05 PM, Randy Dunlap <randy.dunlap@oracle.com> wrote:
>>
>> smp_lock.h was removed from hardirq.h.  smp_lock.h provided the function prototype
>> for kernel_locked().  Should source files now #include <linux/smp_lock.h> ?
>> even when not being built for SMP?
> 
> Hmm. I think that part was a mistake, but I suspect the simplest fix
> for it is to simply get rid of "kernel_locked()". It has no other
> users than the hardirq.h one, so let's just move it there.
> 
> Something like the attached?
> 
> NOTE! The reason I _only_ take the CONFIG_LOCK_KERNEL version from
> smp_lock.h is because:
> 
>  - LOCK_KERNEL is defined by init/Kconfig as "(SMP || PREEMPT) && BKL"
> 
>  - inside hardirq.h we only use "kernel_locked()" inside "PREEMPT && BKL"
> 
>  - so "PREEMPT && BKL" implies "LOCK_KERNEL"
> 
>  - so the !LOCK_KERNEL kernel_locked() case is irrelevant.
> 
> unless I did a thinko somewhere.
> 
> Does this work in all configurations? TOTALLY UNTESTED! Caveat emptor.

It goes from one use of kernel_locked in *.[ch] to no uses of kernel_locked(),
so yes, it works for me.  (I did one previously-failing build with this patch,
and it built with no errors.)

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***