lkml.org 
[lkml]   [2019]   [Sep]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.2 047/185] RAS: Build debugfs.o only when enabled in Kconfig
    Date
    From: Valdis Kletnieks <valdis.kletnieks@vt.edu>

    [ Upstream commit b6ff24f7b5101101ff897dfdde3f37924e676bc2 ]

    In addition, the 0day bot reported this build error:

    >> drivers/ras/debugfs.c:10:5: error: redefinition of 'ras_userspace_consumers'
    int ras_userspace_consumers(void)
    ^~~~~~~~~~~~~~~~~~~~~~~
    In file included from drivers/ras/debugfs.c:3:0:
    include/linux/ras.h:14:19: note: previous definition of 'ras_userspace_consumers' was here
    static inline int ras_userspace_consumers(void) { return 0; }
    ^~~~~~~~~~~~~~~~~~~~~~~

    for a riscv-specific .config where CONFIG_DEBUG_FS is not set. Fix all
    that by making debugfs.o depend on that define.

    [ bp: Rewrite commit message. ]

    Reported-by: kbuild test robot <lkp@intel.com>
    Signed-off-by: Valdis Kletnieks <valdis.kletnieks@vt.edu>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Cc: Tony Luck <tony.luck@intel.com>
    Cc: linux-edac@vger.kernel.org
    Cc: x86@kernel.org
    Link: http://lkml.kernel.org/r/7053.1565218556@turing-police
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/ras/Makefile | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/ras/Makefile b/drivers/ras/Makefile
    index ef6777e14d3df..6f0404f501071 100644
    --- a/drivers/ras/Makefile
    +++ b/drivers/ras/Makefile
    @@ -1,3 +1,4 @@
    # SPDX-License-Identifier: GPL-2.0-only
    -obj-$(CONFIG_RAS) += ras.o debugfs.o
    +obj-$(CONFIG_RAS) += ras.o
    +obj-$(CONFIG_DEBUG_FS) += debugfs.o
    obj-$(CONFIG_RAS_CEC) += cec.o
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-09-22 20:52    [W:4.759 / U:0.468 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site