From patchwork Mon Sep 12 21:59:00 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: 12974140 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 7BC0BC6FA82 for ; Mon, 12 Sep 2022 22:00:10 +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=d8uEei2DOAi6sV Guxk8djYu1qxvjVXh4+d/BUGhaSXc/zXrlYdLB0DfRq0rwfANQMJT9fKef1gyAhwaMir5ZCi6tSuA YgJQlf8uXnQeQKoWdhz4qQilw2CWa4BPEFeTzBr60OofWUaCDkVTLnYSnXkYixn375XfMQySlgurV JDjFFb98ibVCMxwp02DPsrCEQuUzeL4mHX0SUfAnxbFkFxyJUeFaawUV69uQBkyYToxXDl39E7PrF pQf/mL7au+QtPa5TF5DfCOJwlIGhiP1XCs8fAYBVl7FnpdZfwg1855cTPh6G9SdiHXW8ON/i8y013 HYebDxyrb7vp9TVi+4+w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oXrSS-00ESHk-3i; Mon, 12 Sep 2022 21:59:12 +0000 Received: from mail-pf1-f170.google.com ([209.85.210.170]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oXrSP-00ESEg-Fn for linux-arm-kernel@lists.infradead.org; Mon, 12 Sep 2022 21:59:10 +0000 Received: by mail-pf1-f170.google.com with SMTP id a80so1342118pfa.4 for ; Mon, 12 Sep 2022 14:59:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=9U3wiWhwHT0o4HtrfBKVPP9ZTc9e4h3IEtMLmdYLtZc=; b=XomDDKCeILHC1ImVf+cJK+RkIbr9c/C9hhYfEwro+SA9jalJ6uFWET2C3hLnMetfFd Sna4bQyeDmepF6jqW/TxlWExVGDZG/ce4/ijun3VrJNSuCZBGSBnu3DXxxxXpA8Js596 oXI+/Eu/9knzoDNu1a7IdiRwpF98P65QDaaZFhJDwWzTyRIojPfvVfpnDyF5zeRXeZAZ ZRHg3tWsMtqhC+NtE/MEyi42AUMwDcq/IuqbJMOOJ1MVBrxr4FR6oKVxIX0CWVBO1ucP qugepXeFQrRjDelNTO1DKH2TXaTiwmO+ny7eK2OdOQ65auydy1LbJOn7hRoOZOMG3ABP YL1A== X-Gm-Message-State: ACgBeo1M8SbCV9FGPZj1+DLjhi7JMll0/FGUfO5jp2ut50IYNd3uYX9F NOphzO8UVs/q7v4Hv2CQqJo= X-Google-Smtp-Source: AA6agR6q//UQ2Uihnwl3Q171lsbXKapREiR76WJFrAylxTk/JDV6Y7tjIhlIjQbaDErlTvRv0x0ZKw== X-Received: by 2002:a63:6c87:0:b0:42c:1f36:4691 with SMTP id h129-20020a636c87000000b0042c1f364691mr25314265pgc.571.1663019947522; Mon, 12 Sep 2022 14:59:07 -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 o185-20020a625ac2000000b0053e85a4a2c9sm6079214pfb.5.2022.09.12.14.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Sep 2022 14:59:06 -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 14:59:00 -0700 Message-Id: <20220912215900.3907508-1-bvanassche@acm.org> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220912_145909_552344_7648C632 X-CRM114-Status: GOOD ( 13.13 ) 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);