From patchwork Thu Sep 8 20:34:08 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: 12970644 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 30607C54EE9 for ; Thu, 8 Sep 2022 20:35:31 +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=tBO7sLH03IOFuD uVrSpVNBokONmWfW+kFLmyo8IjWlR/Jidxfh61SOYk0fk2BSH/vy8uyihLO76rkgI1gOE8XbiTTCn tsQlmYwvEDRcfZaumbKFwQeanT4b9rnsCk+XRlX+t8xBJxZ+r6HOc5NPPYyYSqP4Qh033FF1UfrFk Oiffz9yPQY9QqHvbok2lZKsoAUZiN0oiHRwCHWl7CBtUEF2fFy8uFQnM+b83VUJlTrietB7lTd8TO NxTTgwgA6b8vvM0+BdfWVEHe4F901BmOdXsWmEOdEk+BvWQ6C20+r0t8qjeXyzap/kfi7BVlmuzRO grxAZ1N1arEa9cXj7UQw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWOE7-008VKw-Dg; Thu, 08 Sep 2022 20:34:19 +0000 Received: from mail-pl1-f173.google.com ([209.85.214.173]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oWOE4-008VJ3-BI for linux-arm-kernel@lists.infradead.org; Thu, 08 Sep 2022 20:34:17 +0000 Received: by mail-pl1-f173.google.com with SMTP id 9so15832106plj.11 for ; Thu, 08 Sep 2022 13:34:14 -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=ykqfE/0oLgn3+4+kNks21j6DAr4VG9u02IAJJZ+V/NZcXX4P9A//vaqU/+DhXl6C0a NldU+Mxqgi1Dj2/vaARcGE82Y6LFQ+Zdec87j2vEiTA45XKlyWbFCihif6R3ZEWkmF61 vazdykIMjeNPEzEP4TJrSpqcnkiXeApZ23N/Gp5S+20zJ5ho+1ZxGWKgB5sRfEIdlbFD q+K/dSeXls0j2s1ctB1t0sL8zip0g7de9+T+bThgDCNdMZpOoHOCWWjrD5FvP0pa8Mtm 2oeJkQxlSxzIVTfk996k4LwCpYKepxroP+ciYnPUMbTNnPPLrwmHDjX+HRm0pnSJvVhK ouVQ== X-Gm-Message-State: ACgBeo0KHC4G1IIhSb0FZQZPykayQ4lCPEmiWyrCySGOouBmrTAgQSVU bXeJPv4IDfhfPMiuAi4QrICkN2ou8/s= X-Google-Smtp-Source: AA6agR7aeJTAxb9+fQ20pQ1fZz+Zs7IE+HgknsKST4bnUjHgjxGKEZmikXsrPaueZBk5ta49wJFC/Q== X-Received: by 2002:a17:90a:428d:b0:200:4851:3160 with SMTP id p13-20020a17090a428d00b0020048513160mr6005675pjg.198.1662669254281; Thu, 08 Sep 2022 13:34:14 -0700 (PDT) Received: from bvanassche-linux.mtv.corp.google.com ([2620:15c:211:201:c18a:7410:112c:aa7c]) by smtp.gmail.com with ESMTPSA id e125-20020a621e83000000b0052dbad1ea2esm39315pfe.6.2022.09.08.13.34.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Sep 2022 13:34:13 -0700 (PDT) From: Bart Van Assche To: Russell King Cc: Bart Van Assche , Arnd Bergmann , linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: riscpc: Unbreak the build Date: Thu, 8 Sep 2022 13:34:08 -0700 Message-Id: <20220908203408.2915537-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-20220908_133416_401397_C5BCBF49 X-CRM114-Status: GOOD ( 12.88 ) 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);