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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB258EB64DA for ; Mon, 10 Jul 2023 08:46:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B8536B0072; Mon, 10 Jul 2023 04:46:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4660F6B0074; Mon, 10 Jul 2023 04:46:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 307736B0075; Mon, 10 Jul 2023 04:46:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 1ABBB6B0072 for ; Mon, 10 Jul 2023 04:46:12 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id DAE9B1602C9 for ; Mon, 10 Jul 2023 08:46:11 +0000 (UTC) X-FDA: 80995070142.27.AC5C11E Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) by imf17.hostedemail.com (Postfix) with ESMTP id C1ACC4001B for ; Mon, 10 Jul 2023 08:46:08 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of glaubitz@zedat.fu-berlin.de designates 130.133.4.66 as permitted sender) smtp.mailfrom=glaubitz@zedat.fu-berlin.de; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688978769; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=O0epH7jeHMS6KEUPQQVNd+PaC4ugeZch3T1uJ+Kwb6M=; b=UfMVTI6R1RDyoyD5ZV0TFrUVXANwhzikTLQBPLCgACcSyMI9xY02fWE4PxnUFKsuowotzc HbeHJ2vwnfwuHO0ukvYzpvuXLjhnm5J3nE66Yn9jMNMItdeNHaYNl1ht2CO0bt9gMTCyP7 pMbS0BEsflYiM+jWiYNHMdIV3O7hY5E= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688978769; a=rsa-sha256; cv=none; b=zJfNJGzGefCukf7LHN02Kaz3j4pCvqJSQ1jwkBrHtaD7WH2Fidge6GArZ1wVKJHIcbAjrc +37GRjU9BIcOaF6dNx1F+jPbu+cvCHjZ6AEv0y6pfMFRhefpIvZoRrC2/9CaQWyDbm/suw BY+SUjEuZ02xm5feDobes+DDO/5O7As= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=none; spf=pass (imf17.hostedemail.com: domain of glaubitz@zedat.fu-berlin.de designates 130.133.4.66 as permitted sender) smtp.mailfrom=glaubitz@zedat.fu-berlin.de; dmarc=none Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost.zedat.fu-berlin.de (Exim 4.95) with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (envelope-from ) id 1qImWs-002r22-5t; Mon, 10 Jul 2023 10:45:58 +0200 Received: from dynamic-089-014-157-058.89.14.pool.telefonica.de ([89.14.157.58] helo=[192.168.1.11]) by inpost2.zedat.fu-berlin.de (Exim 4.95) with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (envelope-from ) id 1qImWr-000o49-Sw; Mon, 10 Jul 2023 10:45:58 +0200 Message-ID: <0f771b11539d5a3871691af901315ee2034b577c.camel@physik.fu-berlin.de> Subject: Re: [PATCH v8 11/19] sh: add including From: John Paul Adrian Glaubitz To: Geert Uytterhoeven , Baoquan He Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org, linux-mm@kvack.org, arnd@arndb.de, hch@lst.de, christophe.leroy@csgroup.eu, rppt@kernel.org, willy@infradead.org, agordeev@linux.ibm.com, wangkefeng.wang@huawei.com, schnelle@linux.ibm.com, shorne@gmail.com, David.Laight@aculab.com, deller@gmx.de, nathan@kernel.org, Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org, Guenter Roeck Date: Mon, 10 Jul 2023 10:45:48 +0200 In-Reply-To: References: <20230706154520.11257-1-bhe@redhat.com> <20230706154520.11257-12-bhe@redhat.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Original-Sender: glaubitz@physik.fu-berlin.de X-Originating-IP: 89.14.157.58 X-ZEDAT-Hint: PO X-Stat-Signature: ytix4t1q51dk9eb7szds5o5wrrdffjam X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: C1ACC4001B X-Rspam-User: X-HE-Tag: 1688978768-540855 X-HE-Meta: U2FsdGVkX19mERcEt83frapgiYZpdUupK+hNFetFzha02hIsmEvP2AMJ7waqpfyyTtwRRV1893tfJywhkTiAHvtip6nke5gFoTPXFH4ysmrZptR7RzyZyvx6dxwAcPjRh7hDM7rRLHwNHSnTDfeOKBJrVSWpb07eiLklbKCH061HC+KYIlEOgPVF5XnEvkgLl9EL2MIPgCUC/czyaupkKAfbCtQoynlFpxhJwyMuydiJFI5uuDGWvknHqS4oKCzScxWyWdEU5sS/IkMsTy/G7bX4o4kZCXtOR3MEy84dZyk36sD3hcL+ayBXjQBtxuN71NJ4x1ZQ7Eit9UtK+VTQoPYbfuoC83TrOcZJmUE7619Ndd91MFey2Cp+jQGfAfnWnn65UKMbN9Bpx31uxANfgaqdG+f5MvvwkGIwcOoUhPiH4oOjOJJgYtLq6lkL7KmEfW1GxsaO0OSE16Q3n7smSLslH2CKtvmBk9WyRaavehhzRTZTZ5UaZhkfIFD4Jmive2Os1DiqRmomkOPZRivOt7/AGJ76h5F+Jgfftyz8B5u5F+GpOT/HQIDEmtdGqsjaG12eZGAGVcNPxBrFoMZaTeo7py6fH1n19ZuTQXnQTTsNrQkayDymiOVwX94TKY7eCzVDGUA/H4KKWfQVhEDwVlH6lo9bTMD3BDZbc2PPkhjScxA0jrMCVJDw15FxNPIIMydrNoFXxJ8CdkkdD93t4eRLWML4tOzgGA3XWUyI6aWN2NWvl7OVWDhWkRBqmB4bTltYycRczOtZlSfpVwugvv0QBVOhpfkav5CsxY6HHNOCwoBSUhKtW4019cUqkyiWh1ZYBdxsz6NVVPo99d5+9+GcqiPC+IWsZNLjDBSGCZ1YUSG2R03+8Bca3RPwEY72Eivxgr+GInoXWPRyp5cnJTXsnUYaQOIrEs5J7LWcZ0hA5PuK4LeNAo8FHmTXgu8a1rDfyqnG2+KDalxTbPv NoQ8OID1 OFGGR7aEwxw/Y0mWcnsAB3kcLp7nqH2vk4k+x4DNdpOtYAC2IGDfXiNfHXgVNWhgXbsTMhOMXTeK4eK9B/OMGQxXxwNTnyDCgY5440dSvGU8T4L1Jw2vzE5dkl0lvA4vHwMFj4vFFZRHVqhE6n4XmQwRq5xjQEShWr7kGcGGjYWoIL2vTTGyJjqC8Jb1OUS9ZWEzrRn6eyvGZMIn22zC8EoDgWN0+qqsa+32aNr1YEA5zo2/iUmOAaFU+d3giUP1LRIw0jEvnKcDIw1upcXBS2UNGm3FlXPUGGSMuU0lhfQWI/85MdmSysKSvWVSQp1wyh9lUopnwlASoRV/LFv/IFcMALAtenuLf6ztH X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Hi! On Mon, 2023-07-10 at 10:17 +0200, Geert Uytterhoeven wrote: > Hi Baoquan, >=20 > On Thu, Jul 6, 2023 at 5:49=E2=80=AFPM Baoquan He wrote: > > In , it provides a generic implementation of all > > I/O accessors. > >=20 > > For some port|mm io functions, SuperH has its own implementation > > in arch/sh/kernel/iomap.c and arch/sh/include/asm/io_noioport.h. > > These will conflict with those in and cause compilin= g > > error. Hence add macro definitions to ensure that the SuperH version > > of them will override the generic version. > >=20 > > Signed-off-by: Baoquan He >=20 > Thanks for your patch, which is now commit edad4470b45298ba ("sh: > add including") in next-20230710. >=20 > This break dreamcast_defconfig: >=20 > CC arch/sh/kernel/asm-offsets.s > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:636:15: error: redefinition of =E2=80=98inb_p= =E2=80=99 > 636 | #define inb_p inb_p > | ^~~~~ > ./include/asm-generic/io.h:637:18: note: in expansion of macro =E2=80=98i= nb_p=E2=80=99 > 637 | static inline u8 inb_p(unsigned long addr) > | ^~~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:185:25: note: previous definition of > =E2=80=98inb_p=E2=80=99 with type =E2=80=98u8(long unsigned int)=E2=80=99= {aka =E2=80=98unsigned char(long > unsigned int)=E2=80=99} > 185 | static inline type pfx##in##bwlq##p(unsigned long port) > \ > | ^~ > ./arch/sh/include/asm/io.h:199:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_SINGLE=E2=80=99 > 199 | __BUILD_IOPORT_SINGLE(bus, bwlq, type, _p, SLOW_DOWN_IO) > | ^~~~~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:202:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_PFX=E2=80=99 > 202 | __BUILD_IOPORT_PFX(, bwlq, type) > | ^~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:204:1: note: in expansion of macro =E2=80=98BU= ILDIO_IOPORT=E2=80=99 > 204 | BUILDIO_IOPORT(b, u8) > | ^~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:644:15: error: redefinition of =E2=80=98inw_p= =E2=80=99 > 644 | #define inw_p inw_p > | ^~~~~ > ./include/asm-generic/io.h:645:19: note: in expansion of macro =E2=80=98i= nw_p=E2=80=99 > 645 | static inline u16 inw_p(unsigned long addr) > | ^~~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:185:25: note: previous definition of > =E2=80=98inw_p=E2=80=99 with type =E2=80=98u16(long unsigned int)=E2=80= =99 {aka =E2=80=98short unsigned > int(long unsigned int)=E2=80=99} > 185 | static inline type pfx##in##bwlq##p(unsigned long port) > \ > | ^~ > ./arch/sh/include/asm/io.h:199:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_SINGLE=E2=80=99 > 199 | __BUILD_IOPORT_SINGLE(bus, bwlq, type, _p, SLOW_DOWN_IO) > | ^~~~~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:202:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_PFX=E2=80=99 > 202 | __BUILD_IOPORT_PFX(, bwlq, type) > | ^~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:205:1: note: in expansion of macro =E2=80=98BU= ILDIO_IOPORT=E2=80=99 > 205 | BUILDIO_IOPORT(w, u16) > | ^~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:652:15: error: redefinition of =E2=80=98inl_p= =E2=80=99 > 652 | #define inl_p inl_p > | ^~~~~ > ./include/asm-generic/io.h:653:19: note: in expansion of macro =E2=80=98i= nl_p=E2=80=99 > 653 | static inline u32 inl_p(unsigned long addr) > | ^~~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:185:25: note: previous definition of > =E2=80=98inl_p=E2=80=99 with type =E2=80=98u32(long unsigned int)=E2=80= =99 {aka =E2=80=98unsigned int(long > unsigned int)=E2=80=99} > 185 | static inline type pfx##in##bwlq##p(unsigned long port) > \ > | ^~ > ./arch/sh/include/asm/io.h:199:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_SINGLE=E2=80=99 > 199 | __BUILD_IOPORT_SINGLE(bus, bwlq, type, _p, SLOW_DOWN_IO) > | ^~~~~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:202:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_PFX=E2=80=99 > 202 | __BUILD_IOPORT_PFX(, bwlq, type) > | ^~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:206:1: note: in expansion of macro =E2=80=98BU= ILDIO_IOPORT=E2=80=99 > 206 | BUILDIO_IOPORT(l, u32) > | ^~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:660:16: error: redefinition of =E2=80=98outb_p= =E2=80=99 > 660 | #define outb_p outb_p > | ^~~~~~ > ./include/asm-generic/io.h:661:20: note: in expansion of macro =E2=80=98o= utb_p=E2=80=99 > 661 | static inline void outb_p(u8 value, unsigned long addr) > | ^~~~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:176:25: note: previous definition of > =E2=80=98outb_p=E2=80=99 with type =E2=80=98void(u8, long unsigned int)= =E2=80=99 {aka =E2=80=98void(unsigned > char, long unsigned int)=E2=80=99} > 176 | static inline void pfx##out##bwlq##p(type val, unsigned long > port) \ > | ^~~ > ./arch/sh/include/asm/io.h:199:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_SINGLE=E2=80=99 > 199 | __BUILD_IOPORT_SINGLE(bus, bwlq, type, _p, SLOW_DOWN_IO) > | ^~~~~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:202:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_PFX=E2=80=99 > 202 | __BUILD_IOPORT_PFX(, bwlq, type) > | ^~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:204:1: note: in expansion of macro =E2=80=98BU= ILDIO_IOPORT=E2=80=99 > 204 | BUILDIO_IOPORT(b, u8) > | ^~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:668:16: error: redefinition of =E2=80=98outw_p= =E2=80=99 > 668 | #define outw_p outw_p > | ^~~~~~ > ./include/asm-generic/io.h:669:20: note: in expansion of macro =E2=80=98o= utw_p=E2=80=99 > 669 | static inline void outw_p(u16 value, unsigned long addr) > | ^~~~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:176:25: note: previous definition of > =E2=80=98outw_p=E2=80=99 with type =E2=80=98void(u16, long unsigned int)= =E2=80=99 {aka =E2=80=98void(short > unsigned int, long unsigned int)=E2=80=99} > 176 | static inline void pfx##out##bwlq##p(type val, unsigned long > port) \ > | ^~~ > ./arch/sh/include/asm/io.h:199:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_SINGLE=E2=80=99 > 199 | __BUILD_IOPORT_SINGLE(bus, bwlq, type, _p, SLOW_DOWN_IO) > | ^~~~~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:202:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_PFX=E2=80=99 > 202 | __BUILD_IOPORT_PFX(, bwlq, type) > | ^~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:205:1: note: in expansion of macro =E2=80=98BU= ILDIO_IOPORT=E2=80=99 > 205 | BUILDIO_IOPORT(w, u16) > | ^~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:676:16: error: redefinition of =E2=80=98outl_p= =E2=80=99 > 676 | #define outl_p outl_p > | ^~~~~~ > ./include/asm-generic/io.h:677:20: note: in expansion of macro =E2=80=98o= utl_p=E2=80=99 > 677 | static inline void outl_p(u32 value, unsigned long addr) > | ^~~~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:176:25: note: previous definition of > =E2=80=98outl_p=E2=80=99 with type =E2=80=98void(u32, long unsigned int)= =E2=80=99 {aka =E2=80=98void(unsigned > int, long unsigned int)=E2=80=99} > 176 | static inline void pfx##out##bwlq##p(type val, unsigned long > port) \ > | ^~~ > ./arch/sh/include/asm/io.h:199:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_SINGLE=E2=80=99 > 199 | __BUILD_IOPORT_SINGLE(bus, bwlq, type, _p, SLOW_DOWN_IO) > | ^~~~~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:202:9: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_PFX=E2=80=99 > 202 | __BUILD_IOPORT_PFX(, bwlq, type) > | ^~~~~~~~~~~~~~~~~~ > ./arch/sh/include/asm/io.h:206:1: note: in expansion of macro =E2=80=98BU= ILDIO_IOPORT=E2=80=99 > 206 | BUILDIO_IOPORT(l, u32) > | ^~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:689:14: error: redefinition of =E2=80=98insb= =E2=80=99 > 689 | #define insb insb > | ^~~~ > ./include/asm-generic/io.h:690:20: note: in expansion of macro =E2=80=98i= nsb=E2=80=99 > 690 | static inline void insb(unsigned long addr, void *buffer, > unsigned int count) > | ^~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:222:20: note: previous definition of =E2=80=98= insb=E2=80=99 > with type =E2=80=98void(long unsigned int, void *, unsigned int)=E2=80= =99 > 222 | static inline void ins##bwlq(unsigned long port, void *addr, > \ > | ^~~ > ./arch/sh/include/asm/io.h:233:1: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_STRING=E2=80=99 > 233 | __BUILD_IOPORT_STRING(b, u8) > | ^~~~~~~~~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:697:14: error: redefinition of =E2=80=98insw= =E2=80=99 > 697 | #define insw insw > | ^~~~ > ./include/asm-generic/io.h:698:20: note: in expansion of macro =E2=80=98i= nsw=E2=80=99 > 698 | static inline void insw(unsigned long addr, void *buffer, > unsigned int count) > | ^~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:222:20: note: previous definition of =E2=80=98= insw=E2=80=99 > with type =E2=80=98void(long unsigned int, void *, unsigned int)=E2=80= =99 > 222 | static inline void ins##bwlq(unsigned long port, void *addr, > \ > | ^~~ > ./arch/sh/include/asm/io.h:234:1: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_STRING=E2=80=99 > 234 | __BUILD_IOPORT_STRING(w, u16) > | ^~~~~~~~~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:705:14: error: redefinition of =E2=80=98insl= =E2=80=99 > 705 | #define insl insl > | ^~~~ > ./include/asm-generic/io.h:706:20: note: in expansion of macro =E2=80=98i= nsl=E2=80=99 > 706 | static inline void insl(unsigned long addr, void *buffer, > unsigned int count) > | ^~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:222:20: note: previous definition of =E2=80=98= insl=E2=80=99 > with type =E2=80=98void(long unsigned int, void *, unsigned int)=E2=80= =99 > 222 | static inline void ins##bwlq(unsigned long port, void *addr, > \ > | ^~~ > ./arch/sh/include/asm/io.h:235:1: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_STRING=E2=80=99 > 235 | __BUILD_IOPORT_STRING(l, u32) > | ^~~~~~~~~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:713:15: error: redefinition of =E2=80=98outsb= =E2=80=99 > 713 | #define outsb outsb > | ^~~~~ > ./include/asm-generic/io.h:714:20: note: in expansion of macro =E2=80=98o= utsb=E2=80=99 > 714 | static inline void outsb(unsigned long addr, const void *buffer, > | ^~~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:211:20: note: previous definition of > =E2=80=98outsb=E2=80=99 with type =E2=80=98void(long unsigned int, const= void *, unsigned > int)=E2=80=99 > 211 | static inline void outs##bwlq(unsigned long port, const void > *addr, \ > | ^~~~ > ./arch/sh/include/asm/io.h:233:1: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_STRING=E2=80=99 > 233 | __BUILD_IOPORT_STRING(b, u8) > | ^~~~~~~~~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:722:15: error: redefinition of =E2=80=98outsw= =E2=80=99 > 722 | #define outsw outsw > | ^~~~~ > ./include/asm-generic/io.h:723:20: note: in expansion of macro =E2=80=98o= utsw=E2=80=99 > 723 | static inline void outsw(unsigned long addr, const void *buffer, > | ^~~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:211:20: note: previous definition of > =E2=80=98outsw=E2=80=99 with type =E2=80=98void(long unsigned int, const= void *, unsigned > int)=E2=80=99 > 211 | static inline void outs##bwlq(unsigned long port, const void > *addr, \ > | ^~~~ > ./arch/sh/include/asm/io.h:234:1: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_STRING=E2=80=99 > 234 | __BUILD_IOPORT_STRING(w, u16) > | ^~~~~~~~~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:731:15: error: redefinition of =E2=80=98outsl= =E2=80=99 > 731 | #define outsl outsl > | ^~~~~ > ./include/asm-generic/io.h:732:20: note: in expansion of macro =E2=80=98o= utsl=E2=80=99 > 732 | static inline void outsl(unsigned long addr, const void *buffer, > | ^~~~~ > In file included from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./arch/sh/include/asm/io.h:211:20: note: previous definition of > =E2=80=98outsl=E2=80=99 with type =E2=80=98void(long unsigned int, const= void *, unsigned > int)=E2=80=99 > 211 | static inline void outs##bwlq(unsigned long port, const void > *addr, \ > | ^~~~ > ./arch/sh/include/asm/io.h:235:1: note: in expansion of macro > =E2=80=98__BUILD_IOPORT_STRING=E2=80=99 > 235 | __BUILD_IOPORT_STRING(l, u32) > | ^~~~~~~~~~~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:1111:20: error: static declaration of > =E2=80=98ioport_map=E2=80=99 follows non-static declaration > 1111 | #define ioport_map ioport_map > | ^~~~~~~~~~ > ./include/asm-generic/io.h:1112:29: note: in expansion of macro =E2=80=98= ioport_map=E2=80=99 > 1112 | static inline void __iomem *ioport_map(unsigned long port, > unsigned int nr) > | ^~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:22, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/iomap.h:92:22: note: previous declaration of > =E2=80=98ioport_map=E2=80=99 with type =E2=80=98void *(long unsigned int,= unsigned int)=E2=80=99 > 92 | extern void __iomem *ioport_map(unsigned long port, unsigned int = nr); > | ^~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:290, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/io.h:1121:22: error: static declaration of > =E2=80=98ioport_unmap=E2=80=99 follows non-static declaration > 1121 | #define ioport_unmap ioport_unmap > | ^~~~~~~~~~~~ > ./include/asm-generic/io.h:1122:20: note: in expansion of macro =E2=80=98= ioport_unmap=E2=80=99 > 1122 | static inline void ioport_unmap(void __iomem *p) > | ^~~~~~~~~~~~ > In file included from ./arch/sh/include/asm/io.h:22, > from ./include/linux/io.h:13, > from ./include/linux/irq.h:20, > from ./include/asm-generic/hardirq.h:17, > from ./arch/sh/include/asm/hardirq.h:9, > from ./include/linux/hardirq.h:11, > from ./include/linux/interrupt.h:11, > from ./include/linux/kernel_stat.h:9, > from ./include/linux/cgroup.h:26, > from ./include/linux/memcontrol.h:13, > from ./include/linux/swap.h:9, > from ./include/linux/suspend.h:5, > from arch/sh/kernel/asm-offsets.c:16: > ./include/asm-generic/iomap.h:93:13: note: previous declaration of > =E2=80=98ioport_unmap=E2=80=99 with type =E2=80=98void(void *)=E2=80=99 > 93 | extern void ioport_unmap(void __iomem *); > | ^~~~~~~~~~~~ > make[2]: *** [scripts/Makefile.build:116: arch/sh/kernel/asm-offsets.s] E= rror 1 > make[1]: *** [Makefile:1275: prepare0] Error 2 > make: *** [Makefile:234: __sub-make] Error 2 >=20 > > --- a/arch/sh/include/asm/io.h > > +++ b/arch/sh/include/asm/io.h > > @@ -119,6 +119,26 @@ void __raw_readsl(const void __iomem *addr, void *= data, int longlen); > >=20 > > __BUILD_MEMORY_STRING(__raw_, q, u64) > >=20 > > +#define ioread8 ioread8 > > +#define ioread16 ioread16 > > +#define ioread16be ioread16be > > +#define ioread32 ioread32 > > +#define ioread32be ioread32be > > + > > +#define iowrite8 iowrite8 > > +#define iowrite16 iowrite16 > > +#define iowrite16be iowrite16be > > +#define iowrite32 iowrite32 > > +#define iowrite32be iowrite32be > > + > > +#define ioread8_rep ioread8_rep > > +#define ioread16_rep ioread16_rep > > +#define ioread32_rep ioread32_rep > > + > > +#define iowrite8_rep iowrite8_rep > > +#define iowrite16_rep iowrite16_rep > > +#define iowrite32_rep iowrite32_rep > > + > > #ifdef CONFIG_HAS_IOPORT_MAP > >=20 > > /* > > @@ -225,6 +245,9 @@ __BUILD_IOPORT_STRING(q, u64) > > #define IO_SPACE_LIMIT 0xffffffff > >=20 > > /* We really want to try and get these to memcpy etc */ > > +#define memset_io memset_io > > +#define memcpy_fromio memcpy_fromio > > +#define memcpy_toio memcpy_toio > > void memcpy_fromio(void *, const volatile void __iomem *, unsigned lon= g); > > void memcpy_toio(volatile void __iomem *, const void *, unsigned long)= ; > > void memset_io(volatile void __iomem *, int, unsigned long); > > @@ -287,6 +310,8 @@ static inline void iounmap(volatile void __iomem *a= ddr) { } > > */ > > #define xlate_dev_mem_ptr(p) __va(p) > >=20 > > +#include > > + > > #define ARCH_HAS_VALID_PHYS_ADDR_RANGE > > int valid_phys_addr_range(phys_addr_t addr, size_t size); > > int valid_mmap_phys_addr_range(unsigned long pfn, size_t size); > > diff --git a/arch/sh/include/asm/io_noioport.h b/arch/sh/include/asm/io= _noioport.h > > index f7938fe0f911..5ba4116b4265 100644 > > --- a/arch/sh/include/asm/io_noioport.h > > +++ b/arch/sh/include/asm/io_noioport.h > > @@ -53,6 +53,13 @@ static inline void ioport_unmap(void __iomem *addr) > > #define outw_p(x, addr) outw((x), (addr)) > > #define outl_p(x, addr) outl((x), (addr)) > >=20 > > +#define insb insb > > +#define insw insw > > +#define insl insl > > +#define outsb outsb > > +#define outsw outsw > > +#define outsl outsl > > + > > static inline void insb(unsigned long port, void *dst, unsigned long c= ount) > > { > > BUG(); > > -- > > 2.34.1 I'm not happy though that this patch is in linux-next without being Acked b= y me or being reviewed by anyone. We should always make sure first that the code actually builds and has been tested on real hardware. Adrian --=20 .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913