Skip to content
  • Linus Torvalds's avatar
    Fix build failure due to hwirq.h needing smp_lock.h · 7957f0a8
    Linus Torvalds authored
    Arnd Bergmann did an automated scripting run to find left-over instances
    of <linux/smp_lock.h>, and had made it trigger it on the normal BKL use
    of lock_kernel and unlock_lernel (and apparently release_kernel_lock and
    reacquire_kernel_lock too, used by the scheduler).
    
    That resulted in commit 451a3c24
    
     ("BKL: remove extraneous #include
    <smp_lock.h>").
    
    However, hardirq.h was the only remaining user of the old
    'kernel_locked()' interface, and Arnd's script hadn't checked for that.
    So depending on your configuration and what header files had been
    included, you would get errors like "implicit declaration of function
    'kernel_locked'" during the build.
    
    The right fix is not to just re-instate the smp_lock.h include - it is
    to just remove 'kernel_locked()' entirely, since the only use was this
    one special low-level detail.  Just make hardirq.h do it directly.
    
    In fact this simplifies and clarifies the code, because some trivial
    analysis makes it clear that hardirq.h only ever used _one_ of the two
    definitions of kernel_locked(), so we can remove the other one entirely.
    
    Reported-by: default avatarZimny Lech <napohybelskurwysynom2010@gmail.com>
    Reported-and-acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
    Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    7957f0a8