diff options
| author |   Valdis Kletnieks <valdis.kletnieks@vt.edu> | 2019-08-08 16:32:27 +0200 |
|---|---|---|
| committer |   Borislav Petkov <bp@suse.de> | 2019-08-08 17:44:02 +0200 |
| commit | b6ff24f7b5101101ff897dfdde3f37924e676bc2 (patch) | |
| tree | 2041bfdfd50649ce25a004145235aef1eb8e2bf4 /drivers/ras | |
| parent | RAS: Fix prototype warnings (diff) | |
| download | linux-dev-b6ff24f7b5101101ff897dfdde3f37924e676bc2.tar.xz linux-dev-b6ff24f7b5101101ff897dfdde3f37924e676bc2.zip | |
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
Diffstat (limited to 'drivers/ras')
| -rw-r--r-- | drivers/ras/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
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 |