Re: [patch V2 06/15] rcuwait: Add @state argument to rcuwait_wait_event()

Davidlohr Bueso
2020-03-20T05:38:15Z

On Wed, 18 Mar 2020, Thomas Gleixner wrote:

>--- a/include/linux/rcuwait.h
>+++ b/include/linux/rcuwait.h
>@@ -3,6 +3,7 @@
> #define _LINUX_RCUWAIT_H_
>
> #include <linux/rcupdate.h>
>+#include <linux/sched/signal.h>

So this is causing build to fail for me:

CC arch/x86/boot/compressed/cmdline.o
arch/x86/boot/compressed/cmdline.c:5:20: error: conflicting types for ‘set_fs’
static inline void set_fs(unsigned long seg)
^~~~~~
In file included from ./include/linux/uaccess.h:11:0,
from ./include/linux/sched/task.h:11,
from ./include/linux/sched/signal.h:9,
from ./include/linux/rcuwait.h:6,
from ./include/linux/percpu-rwsem.h:8,
from ./include/linux/fs.h:34,
from ./include/linux/proc_fs.h:9,
from ./include/acpi/acpi_bus.h:83,
from ./include/linux/acpi.h:32,
from arch/x86/boot/compressed/misc.h:28,
from arch/x86/boot/compressed/cmdline.c:2:
./arch/x86/include/asm/uaccess.h:29:20: note: previous definition of ‘set_fs’ was here
static inline void set_fs(mm_segment_t fs)
^~~~~~
make[2]: *** [scripts/Makefile.build:268: arch/x86/boot/compressed/cmdline.o] Error 1
make[1]: *** [arch/x86/boot/Makefile:113: arch/x86/boot/compressed/vmlinux] Error 2
make: *** [arch/x86/Makefile:285: bzImage] Error 2

Right now I'm not sure what the proper fix should be.

Thanks,
Davidlohr