Le 3/10/19 à 21:10, Greg Kroah-Hartman a écrit :
> On Thu, Oct 03, 2019 at 09:02:23PM +0200, François Valenduc wrote:
>> This does not compile. I get this error:
>>
>> CC drivers/ras/debugfs.o
>> drivers/ras/debugfs.c:9:5: error: redefinition of 'ras_userspace_consumers'
>> int ras_userspace_consumers(void)
>> ^~~~~~~~~~~~~~~~~~~~~~~
>> In file included from drivers/ras/debugfs.c:2:
>> ./include/linux/ras.h:14:19: note: previous definition of
>> 'ras_userspace_consumers' was here
>> static inline int ras_userspace_consumers(void) { return 0; }
>> ^~~~~~~~~~~~~~~~~~~~~~~
>> drivers/ras/debugfs.c:39:12: error: redefinition of 'ras_add_daemon_trace'
>> int __init ras_add_daemon_trace(void)
>> ^~~~~~~~~~~~~~~~~~~~
>> In file included from drivers/ras/debugfs.c:2:
>> ./include/linux/ras.h:16:19: note: previous definition of
>> 'ras_add_daemon_trace' was here
>> static inline int ras_add_daemon_trace(void) { return 0; }
>> ^~~~~~~~~~~~~~~~~~~~
>> drivers/ras/debugfs.c:55:13: error: redefinition of 'ras_debugfs_init'
>> void __init ras_debugfs_init(void)
>> ^~~~~~~~~~~~~~~~
>> In file included from drivers/ras/debugfs.c:2:
>> ./include/linux/ras.h:15:20: note: previous definition of
>> 'ras_debugfs_init' was here
>> static inline void ras_debugfs_init(void) { }
>> ^~~~~~~~~~~~~~~~
>> make[2]: *** [scripts/Makefile.build:304: drivers/ras/debugfs.o] Error 1
>> make[1]: *** [scripts/Makefile.build:544: drivers/ras] Error 2
>> make: *** [Makefile:1046: drivers] Error 2
>> zsh: exit 2 LANG="C" make
>>
>>
>> Does somebody have an idea about this ?
> If you add b6ff24f7b510 ("RAS: Build debugfs.o only when enabled in
> Kconfig") to your tree, does that solve the issue?
>
> This should not be a new thing right?
>
> And is this riscv?
>
> thanks,
>
> greg k-h
This indeed works with a trivially modified version of the patch. The
original one doesn't apply because apparently of the SPDX identiers.
This one works:
diff --git a/drivers/ras/Makefile b/drivers/ras/Makefile
index 7b26dd3aa5d0..6a2a7da37e61 100644
--- a/drivers/ras/Makefile
+++ b/drivers/ras/Makefile
@@ -1,2 +1,3 @@
-obj-$(CONFIG_RAS) += ras.o debugfs.o
+obj-$(CONFIG_RAS) += ras.o
+obj-$(CONFIG_DEBUG_FS) += debugfs.o
obj-$(CONFIG_RAS_CEC) += cec.o
And this is on x86.
François Valenduc
