From patchwork Tue Aug 30 19:55:17 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: 12959826 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 57256ECAAA1 for ; Tue, 30 Aug 2022 19:56:48 +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=Adk9S4LPeuTAV/ocWgdtJ0c14hhVWDNbdRYwW2XUxHs=; b=Votf4kLhgkJ+1s k4BIL9mvgBQhEtFDZRXZOAhXsM+lkWXMhtgoCG/5Kw2AKcBhhV8EnXx2CynWq4l7UP9nAq4cexpTS hj1eFvYyA6+a62aBJuGxhfrSqqq2+C5yzTMmg/9eMz43AtdIsNud7hrvm/MayMbkWW7Xf+ZeuyI7n duMVp6DcneW60TvT5uYJuzsYZDq/tv+hhewtjnyYU2vZa3qOKRQ2/LR/93bpj9ReUiTNx3y/V64TM LSiHW0O9+Yoa9LQAlq4WTbB7DGHyhoX8+e40iWIDTU6FqqIHeTjRobEnthxZtVzl0yRtpuS//My0Z leYNX2yllfekXQf9nzmw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oT7Kn-001bUp-VR; Tue, 30 Aug 2022 19:55:42 +0000 Received: from mail-pg1-f177.google.com ([209.85.215.177]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oT7Kj-001bSw-7l for linux-arm-kernel@lists.infradead.org; Tue, 30 Aug 2022 19:55:38 +0000 Received: by mail-pg1-f177.google.com with SMTP id 202so11592531pgc.8 for ; Tue, 30 Aug 2022 12:55:36 -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; bh=eU4SKzwLHtj1tThUGy5B8Tjl6FzNOYNTgC0pZ9ToLeA=; b=OCi2PKhAilFDen9Zo9EadGDN9NDpeib01CdMErPoczR2bFW5APuH/srWUuHwcuYozJ 4S5D/onFgILqWx6Szr9coNEisdaM6qxXRbga2RS8R9AjMP4FBLQzxreMw1XmYPnHCsdZ JiOnheAg4GkUC5mju7JyeOymWXJnqtw2v2jZWXtRfre2FSrYwOVOGS5LQM1XWRHvULIv ib7T7BxuTlEWo+0Cfk+p5E2JZXPSkUqD+HrFKCEXafQZhv/Qi90TAhQZrFy4b3qWjy8m u2i+fzXEtRWaD+T7Y1u8WzL1bAssJmldwy86g9/K45n3Mb5WJIzgWjcq6WF6qsyJSNr6 7qOQ== X-Gm-Message-State: ACgBeo0OZq9wjBLEsr3IHIMboCi4z//buLJiToWoYUwTiPM1Q18AMCD/ j1wbcoo9gwKmXybFBRvogcI= X-Google-Smtp-Source: AA6agR6w9pVd0iba/KF6S+ftZ9yV6mKvf0kYtHg27qXMjfXzQ6WW0xLDfIdNgooXddosPcfak3ONXQ== X-Received: by 2002:a63:1921:0:b0:42b:6eb3:bce5 with SMTP id z33-20020a631921000000b0042b6eb3bce5mr19619341pgl.231.1661889336186; Tue, 30 Aug 2022 12:55:36 -0700 (PDT) Received: from bvanassche-glaptop2.roam.corp.google.com ([12.219.165.6]) by smtp.gmail.com with ESMTPSA id n2-20020a63e042000000b004298d7b6e70sm1993552pgj.54.2022.08.30.12.55.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Aug 2022 12:55:35 -0700 (PDT) From: Bart Van Assche To: Russell King Cc: linux-arm-kernel@lists.infradead.org, Bart Van Assche , Arnd Bergmann Subject: [PATCH] ARM: riscpc: Unbreak the build Date: Tue, 30 Aug 2022 12:55:17 -0700 Message-Id: <20220830195520.1668785-1-bvanassche@acm.org> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220830_125537_310546_8B7D6CFC X-CRM114-Status: GOOD ( 12.53 ) 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 Signed-off-by: Bart Van Assche --- arch/arm/mach-rpc/include/mach/uncompress.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/mach-rpc/include/mach/uncompress.h b/arch/arm/mach-rpc/include/mach/uncompress.h index 1fbe7eb956fd..97edaf6a1f07 100644 --- a/arch/arm/mach-rpc/include/mach/uncompress.h +++ b/arch/arm/mach-rpc/include/mach/uncompress.h @@ -6,7 +6,6 @@ */ #define VIDMEM ((char *)SCREEN_START) -#include #include #include #include