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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8267AC4332F for ; Wed, 19 Oct 2022 08:51:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231663AbiJSIvM (ORCPT ); Wed, 19 Oct 2022 04:51:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232106AbiJSIuW (ORCPT ); Wed, 19 Oct 2022 04:50:22 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 642848E704; Wed, 19 Oct 2022 01:48:49 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id ABC4461804; Wed, 19 Oct 2022 08:47:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0254C433C1; Wed, 19 Oct 2022 08:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169266; bh=zg+p61KItxBrk4fp24Kbh1QhrpK1b7WGZ7RcxpNQlec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mmnCTUDEdGvdkmM3go/QS+HV2hecDfmXuOImaeLlEJ8eny38JJ1b73459PUblKdN+ 7r6uFftTha0J+szs87nd3F8eSNrcAXPQ/rjaM/KWylpGv50+BJB/zsP4ebExPYxd1i bBoixQQ9eQVVgkrw3O4o8CANaRe9xXpZA964CXLU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, Russell King Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Bart Van Assche , "Russell King (Oracle)" , Sasha Levin Subject: [PATCH 6.0 214/862] ARM: 9243/1: riscpc: Unbreak the build Date: Wed, 19 Oct 2022 10:25:01 +0200 Message-Id: <20221019083259.482159525@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bart Van Assche [ Upstream commit 32844a8eecaa4a3e65841c53e43e04a9087d1ef6 ] This patch fixes the following build error: In file included from ./include/linux/io.h:13, from ./arch/arm/mach-rpc/include/mach/uncompress.h:9, from arch/arm/boot/compressed/misc.c:31: ./arch/arm/include/asm/io.h:85:22: error: conflicting types for ‘__raw_writeb’ 85 | #define __raw_writeb __raw_writeb | ^~~~~~~~~~~~ ./arch/arm/include/asm/io.h:86:20: note: in expansion of macro ‘__raw_writeb’ 86 | static inline void __raw_writeb(u8 val, volatile void __iomem *addr) | ^~~~~~~~~~~~ In file included from arch/arm/boot/compressed/misc.c:26: arch/arm/boot/compressed/misc-ep93xx.h:13:20: note: previous definition of ‘__raw_writeb’ was here 13 | static inline void __raw_writeb(unsigned char value, unsigned int ptr) | ^~~~~~~~~~~~ To: Russell King Cc: Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org Fixes: 0361c7e504b1 ("ARM: ep93xx: multiplatform support") Signed-off-by: Bart Van Assche Signed-off-by: Russell King (Oracle) Signed-off-by: Sasha Levin --- arch/arm/boot/compressed/misc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/boot/compressed/misc.c b/arch/arm/boot/compressed/misc.c index cb2e069dc73f..abfed1aa2baa 100644 --- a/arch/arm/boot/compressed/misc.c +++ b/arch/arm/boot/compressed/misc.c @@ -23,7 +23,9 @@ unsigned int __machine_arch_type; #include #include #include "misc.h" +#ifdef CONFIG_ARCH_EP93XX #include "misc-ep93xx.h" +#endif static void putstr(const char *ptr); -- 2.35.1 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4C3EAC43217 for ; Wed, 19 Oct 2022 08:48:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vv1tBDKnyOkCd2r/HhwaqAmxUhZr+zRimbpSMPnGKz8=; b=KlyrHk19mQIoYK 2Bd4vdMnY7+AGneT9q5MEYocfgOL1kMT8x27/MOVJwck35PJhWX2cLp4woyiD4MsT5PoAZvPWxpi/ QAcW0086PuDHM1ARDmzLsKJ0tufPRtYhyy0OLHF5ZXWQrbWKU7Dse1CfjycvGsV3UqdlC3HGJFojM OSQIMkguUee3ZEITvx2G5PrujFlG/9ehNZGJhGn0AppHREHHxbFelYIL2hR0my/+Rt/8vouuRRIyA fPWQ8Arl7KSah2Yvecx4QzQilH44E9JagpYZx7Z0KwUEMkGBurfXPQYQB0swk0dQyYYN2mmv2/y1l aW+SwN5Ry0woGn98H0JQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ol4jw-00GrDm-5d; Wed, 19 Oct 2022 08:47:52 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ol4js-00Gr8J-Pc for linux-arm-kernel@lists.infradead.org; Wed, 19 Oct 2022 08:47:50 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 48938B822E8; Wed, 19 Oct 2022 08:47:47 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B0254C433C1; Wed, 19 Oct 2022 08:47:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666169266; bh=zg+p61KItxBrk4fp24Kbh1QhrpK1b7WGZ7RcxpNQlec=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mmnCTUDEdGvdkmM3go/QS+HV2hecDfmXuOImaeLlEJ8eny38JJ1b73459PUblKdN+ 7r6uFftTha0J+szs87nd3F8eSNrcAXPQ/rjaM/KWylpGv50+BJB/zsP4ebExPYxd1i bBoixQQ9eQVVgkrw3O4o8CANaRe9xXpZA964CXLU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, Russell King Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Bart Van Assche , "Russell King (Oracle)" , Sasha Levin Subject: [PATCH 6.0 214/862] ARM: 9243/1: riscpc: Unbreak the build Date: Wed, 19 Oct 2022 10:25:01 +0200 Message-Id: <20221019083259.482159525@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221019_014749_029827_562007B3 X-CRM114-Status: GOOD ( 14.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogQmFydCBWYW4gQXNzY2hlIDxidmFuYXNzY2hlQGFjbS5vcmc+CgpbIFVwc3RyZWFtIGNv bW1pdCAzMjg0NGE4ZWVjYWE0YTNlNjU4NDFjNTNlNDNlMDRhOTA4N2QxZWY2IF0KClRoaXMgcGF0 Y2ggZml4ZXMgdGhlIGZvbGxvd2luZyBidWlsZCBlcnJvcjoKCkluIGZpbGUgaW5jbHVkZWQgZnJv bSAuL2luY2x1ZGUvbGludXgvaW8uaDoxMywKICAgICAgICAgICAgICAgICBmcm9tIC4vYXJjaC9h cm0vbWFjaC1ycGMvaW5jbHVkZS9tYWNoL3VuY29tcHJlc3MuaDo5LAogICAgICAgICAgICAgICAg IGZyb20gYXJjaC9hcm0vYm9vdC9jb21wcmVzc2VkL21pc2MuYzozMToKLi9hcmNoL2FybS9pbmNs dWRlL2FzbS9pby5oOjg1OjIyOiBlcnJvcjogY29uZmxpY3RpbmcgdHlwZXMgZm9yIOKAmF9fcmF3 X3dyaXRlYuKAmQogICA4NSB8ICNkZWZpbmUgX19yYXdfd3JpdGViIF9fcmF3X3dyaXRlYgogICAg ICB8ICAgICAgICAgICAgICAgICAgICAgIF5+fn5+fn5+fn5+fgouL2FyY2gvYXJtL2luY2x1ZGUv YXNtL2lvLmg6ODY6MjA6IG5vdGU6IGluIGV4cGFuc2lvbiBvZiBtYWNybyDigJhfX3Jhd193cml0 ZWLigJkKICAgODYgfCBzdGF0aWMgaW5saW5lIHZvaWQgX19yYXdfd3JpdGViKHU4IHZhbCwgdm9s YXRpbGUgdm9pZCBfX2lvbWVtICphZGRyKQogICAgICB8ICAgICAgICAgICAgICAgICAgICBefn5+ fn5+fn5+fn4KSW4gZmlsZSBpbmNsdWRlZCBmcm9tIGFyY2gvYXJtL2Jvb3QvY29tcHJlc3NlZC9t aXNjLmM6MjY6CmFyY2gvYXJtL2Jvb3QvY29tcHJlc3NlZC9taXNjLWVwOTN4eC5oOjEzOjIwOiBu b3RlOiBwcmV2aW91cyBkZWZpbml0aW9uIG9mIOKAmF9fcmF3X3dyaXRlYuKAmSB3YXMgaGVyZQog ICAxMyB8IHN0YXRpYyBpbmxpbmUgdm9pZCBfX3Jhd193cml0ZWIodW5zaWduZWQgY2hhciB2YWx1 ZSwgdW5zaWduZWQgaW50IHB0cikKICAgICAgfCAgICAgICAgICAgICAgICAgICAgXn5+fn5+fn5+ fn5+CgpUbzogUnVzc2VsbCBLaW5nIDxsaW51eEBhcm1saW51eC5vcmcudWs+CgpDYzogQXJuZCBC ZXJnbWFubiA8YXJuZEBhcm5kYi5kZT4KQ2M6IGxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFk ZWFkLm9yZwpGaXhlczogMDM2MWM3ZTUwNGIxICgiQVJNOiBlcDkzeHg6IG11bHRpcGxhdGZvcm0g c3VwcG9ydCIpClNpZ25lZC1vZmYtYnk6IEJhcnQgVmFuIEFzc2NoZSA8YnZhbmFzc2NoZUBhY20u b3JnPgpTaWduZWQtb2ZmLWJ5OiBSdXNzZWxsIEtpbmcgKE9yYWNsZSkgPHJtaytrZXJuZWxAYXJt bGludXgub3JnLnVrPgpTaWduZWQtb2ZmLWJ5OiBTYXNoYSBMZXZpbiA8c2FzaGFsQGtlcm5lbC5v cmc+Ci0tLQogYXJjaC9hcm0vYm9vdC9jb21wcmVzc2VkL21pc2MuYyB8IDIgKysKIDEgZmlsZSBj aGFuZ2VkLCAyIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9hcmNoL2FybS9ib290L2NvbXBy ZXNzZWQvbWlzYy5jIGIvYXJjaC9hcm0vYm9vdC9jb21wcmVzc2VkL21pc2MuYwppbmRleCBjYjJl MDY5ZGM3M2YuLmFiZmVkMWFhMmJhYSAxMDA2NDQKLS0tIGEvYXJjaC9hcm0vYm9vdC9jb21wcmVz c2VkL21pc2MuYworKysgYi9hcmNoL2FybS9ib290L2NvbXByZXNzZWQvbWlzYy5jCkBAIC0yMyw3 ICsyMyw5IEBAIHVuc2lnbmVkIGludCBfX21hY2hpbmVfYXJjaF90eXBlOwogI2luY2x1ZGUgPGxp bnV4L3R5cGVzLmg+CiAjaW5jbHVkZSA8bGludXgvbGlua2FnZS5oPgogI2luY2x1ZGUgIm1pc2Mu aCIKKyNpZmRlZiBDT05GSUdfQVJDSF9FUDkzWFgKICNpbmNsdWRlICJtaXNjLWVwOTN4eC5oIgor I2VuZGlmCiAKIHN0YXRpYyB2b2lkIHB1dHN0cihjb25zdCBjaGFyICpwdHIpOwogCi0tIAoyLjM1 LjEKCgoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmxp bnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFk ZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4 LWFybS1rZXJuZWwK