From patchwork Mon Sep 12 22:13:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bart Van Assche X-Patchwork-Id: 12974145 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 AA8DFC6FA83 for ; Mon, 12 Sep 2022 22:15:50 +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: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:In-Reply-To:References: List-Owner; bh=PoxapC2jWT1gnTVzVoOO4eQzZW9F+zspLhcDSOyS+fI=; b=EDd0ge260dZ5fo nbqQc3+0IA9k6SDC2Gct5IGRrM6JC2r5gQ0dmlkLqtxPu53VNKt4wKNlfeiI4HSVA8jzLFNn1Y3J8 dZ4WH4txR/yHR2GxFFEZaL2ZV6wfIWnWaHDJM4JKUs7+jInPXL50BuCUwuy3+gB7OGaEeJsXDmn0v 3WJ96qJ0LbIY2GrMCj1T5V5OifmlR+j0PfxQ20yv16eDGgzUwZpaoAXtmw9d7EBTHBcUKpaf6u//t vFlMR63R5ntGlIAt57mCsPMEcwJZ5iCPsLryDiwO/KhgQraW/iMrbHPsf2LOUAabMgzH8xtzRHQsB W5j5bnYrkxZoQKfKYlpQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oXrh8-00EdjJ-JU; Mon, 12 Sep 2022 22:14:22 +0000 Received: from mail-pg1-f170.google.com ([209.85.215.170]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oXrh5-00EdfZ-Qn for linux-arm-kernel@lists.infradead.org; Mon, 12 Sep 2022 22:14:21 +0000 Received: by mail-pg1-f170.google.com with SMTP id 78so9517385pgb.13 for ; Mon, 12 Sep 2022 15:14:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:kernelversion:mime-version:message-id :date:subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date; bh=9U3wiWhwHT0o4HtrfBKVPP9ZTc9e4h3IEtMLmdYLtZc=; b=Q4EJVck7lnybGZYC3ZyJ2Yalzw/qD2rbn+cis7P4EKADhQ1YViI7ZkNOSiCbk74iu7 BKXmUvyTiLsZiV7qyPvPf5OT1i4bRrXPiLzQOhkb9Vl++iF9sxCT3aDsA2Vr8RVm98Jl WHi8ZVfg3pwmHZw8O7g+tH88PgUtbRJ6WfR7ubpD1TxVqvZGUaPIcwqITuEoyHPvKVH9 YUjcEoUU3MLWhd1t9Zsl9KbC8/EJnMGuoPgWkRK6Xt4jC6F5SoctI/G/bsWWOcREv+V/ jf0t15VOYej1uyVx6PM26lVRGtnLXP94u2EvytKYRxzmCSm7TaNFZKek35Yg7A+2c+G5 FRsw== X-Gm-Message-State: ACgBeo1cBsLGagoUq4NF6NW5oSB518dOsbzAYTaXJz/CDw7Ip+acYqRS zdGPhlvbdmSeIwYk5xI3n8IxOIJgpk0= X-Google-Smtp-Source: AA6agR6mYU2bU0BLVvioZp8GyNu7qASvCREDMQIWoSAINuZPJsm502uZacedNtBZq+sETJfQ13uEKA== X-Received: by 2002:a63:515d:0:b0:42a:cf33:4320 with SMTP id r29-20020a63515d000000b0042acf334320mr16250695pgl.21.1663020857619; Mon, 12 Sep 2022 15:14:17 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:b206:445a:9717:79df]) by smtp.gmail.com with ESMTPSA id i68-20020a626d47000000b0053bbaab3511sm6273774pfc.172.2022.09.12.15.14.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Sep 2022 15:14:16 -0700 (PDT) From: Bart Van Assche To: patches@arm.linux.org.uk Cc: Bart Van Assche , Arnd Bergmann , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: riscpc: Unbreak the build Date: Mon, 12 Sep 2022 15:13:53 -0700 Message-Id: <20220912221353.3926804-1-bvanassche@acm.org> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog MIME-Version: 1.0 KernelVersion: v6.0-rc1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220912_151419_883772_DBA4023B X-CRM114-Status: GOOD ( 13.12 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- 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);