From: tip-bot for Valdis Kletnieks <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, valdis.kletnieks@vt.edu, tglx@linutronix.de,
tony.luck@intel.com, linux-kernel@vger.kernel.org, bp@suse.de,
hpa@zytor.com, lkp@intel.com
Subject: [tip:ras/core] RAS: Build debugfs.o only when enabled in Kconfig
Date: Thu, 8 Aug 2019 08:50:12 -0700 [thread overview]
Message-ID: <tip-b6ff24f7b5101101ff897dfdde3f37924e676bc2@git.kernel.org> (raw)
In-Reply-To: <7053.1565218556@turing-police>
Commit-ID: b6ff24f7b5101101ff897dfdde3f37924e676bc2
Gitweb: https://git.kernel.org/tip/b6ff24f7b5101101ff897dfdde3f37924e676bc2
Author: Valdis Kletnieks <valdis.kletnieks@vt.edu>
AuthorDate: Thu, 8 Aug 2019 16:32:27 +0200
Committer: Borislav Petkov <bp@suse.de>
CommitDate: Thu, 8 Aug 2019 17:44:02 +0200
RAS: Build debugfs.o only when enabled in Kconfig
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
---
drivers/ras/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/ras/Makefile b/drivers/ras/Makefile
index ef6777e14d3d..6f0404f50107 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
prev parent reply other threads:[~2019-08-08 15:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-07 22:55 [PATCH v2 1/2] drivers/ras: Don't build debugfs.o if no debugfs in config Valdis Klētnieks
2019-08-08 9:31 ` Borislav Petkov
2019-08-08 13:01 ` Valdis Klētnieks
2019-08-08 14:20 ` Borislav Petkov
2019-08-08 14:35 ` Borislav Petkov
2019-08-08 15:08 ` Valdis Klētnieks
2019-08-08 15:14 ` Borislav Petkov
2019-08-08 15:18 ` Valdis Klētnieks
2019-08-08 15:50 ` tip-bot for Valdis Kletnieks [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-b6ff24f7b5101101ff897dfdde3f37924e676bc2@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@suse.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lkp@intel.com \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=valdis.kletnieks@vt.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.