From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3808C4332B for ; Fri, 20 Mar 2020 05:38:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B4C3420739 for ; Fri, 20 Mar 2020 05:38:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726906AbgCTFiN convert rfc822-to-8bit (ORCPT ); Fri, 20 Mar 2020 01:38:13 -0400 Received: from mx2.suse.de ([195.135.220.15]:52332 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726030AbgCTFiN (ORCPT ); Fri, 20 Mar 2020 01:38:13 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 3EF15AC42; Fri, 20 Mar 2020 05:38:08 +0000 (UTC) Date: Thu, 19 Mar 2020 22:36:57 -0700 From: Davidlohr Bueso To: Thomas Gleixner Cc: LKML , Peter Zijlstra , Linus Torvalds , Ingo Molnar , Will Deacon , "Paul E . McKenney" , Joel Fernandes , Steven Rostedt , Randy Dunlap , Oleg Nesterov , Sebastian Andrzej Siewior , Logan Gunthorpe , Kurt Schwemmer , Bjorn Helgaas , linux-pci@vger.kernel.org, Felipe Balbi , Greg Kroah-Hartman , linux-usb@vger.kernel.org, Kalle Valo , "David S. Miller" , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Michael Ellerman , Arnd Bergmann , linuxppc-dev@lists.ozlabs.org Subject: Re: [patch V2 06/15] rcuwait: Add @state argument to rcuwait_wait_event() Message-ID: <20200320053657.ggvcqsjtdotmrl7p@linux-p48b> References: <20200318204302.693307984@linutronix.de> <20200318204408.010461877@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8BIT In-Reply-To: <20200318204408.010461877@linutronix.de> User-Agent: NeoMutt/20180716 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 >+#include 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