• Paul Mundt's avatar
    bug.h: Fix up CONFIG_BUG=n implicit function declarations. · 09682c1d
    Paul Mundt authored
    Commit 2603efa3 ("bug.h: Fix up powerpc build regression") corrected
    the powerpc build case and extended the __ASSEMBLY__ guards, but it also
    got caught in pre-processor hell accidentally matching the else case of
    CONFIG_BUG resulting in the BUG disabled case tripping up on
    -Werror=implicit-function-declaration.
    
    It's not possible to __ASSEMBLY__ guard the entire file as architecture
    code needs to get at the BUGFLAG_WARNING definition in the GENERIC_BUG
    case, but the rest of the CONFIG_BUG=y/n case needs to be guarded.
    
    Rather than littering endless __ASSEMBLY__ checks in each of the if/else
    cases we just move the BUGFLAG definitions up under their own
    GENERIC_BUG test and then shove everything else under one big
    __ASSEMBLY__ guard.
    
    Build tested on all of x86 CONFIG_BUG=y, CONFIG_BUG=n, powerpc (due to
    it's dependence on BUGFLAG definitions in assembly code), and sh (due to
    not bringing in linux/kernel.h to satisfy the taint flag definitions used
    by the generic bug code).
    
    Hopefully that's the end of the corner cases and I can abstain from ever
    having to touch this infernal header ever again.
    Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
    Tested-by: default avatarFengguang Wu <wfg@linux.intel.com>
    Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
    Cc: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    09682c1d
bug.h 5.5 KB