From patchwork Wed Oct 19 08:25:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4607 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp211136wrs; Wed, 19 Oct 2022 02:04:10 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7HZUzcwcw1+c5I/mk/5Nk7r8iRREB1EHOqPVmyYGkKDSBPFqBQNlq48M0g8zIxTObI1nt3 X-Received: by 2002:a17:90b:2812:b0:20d:7a3b:df3e with SMTP id qb18-20020a17090b281200b0020d7a3bdf3emr44403021pjb.169.1666170250291; Wed, 19 Oct 2022 02:04:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666170250; cv=none; d=google.com; s=arc-20160816; b=lD6ynsoCyIDM65fmllmtKaXzqi2/QB/20nndt26e/9XG7LYKLJuAawjdcnvPFP3eFE ZdZFSkWibcSdFe9Ersdynh1XTKxFW2crc7Bd071eMs/szekI0adle9CMrSBZey8TpqXC xl6czaOhJTEd5a+Uj/4N1pkrtlx50IScvyO4WGSctjV/B+5/cOVnbsXIFpikUxKvugUe 3qYFkh7W1FAz7NnjC7dYBPy09nEd8abVyHyILYidK+sw9JpvJxFDk3sdhhsk2AJ0awBx cTB2f0ALdW4PmO5eqzIyQNiFsMv+rtJSmjnIRal3JjUnXj2JmbJw3/EC2GZ0wClTsLAP KQCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4xMZv8ViEE3E0v4W3WxEk+hihv0YDpHtzrZ7rUZ5tTM=; b=ef13ke6TF/dj+7xh7t89N9UPwF+iHqAU2aiKWIirbK/PILuG/x2AG/ZP2tnnMDkskX CDBKbguXPv7/MxxWMVsPRTPgIpaO5DGTV452z/Qscvs+VgXv/QxsQai62Q/qmCME24Oi rKVujwagKu0sZTFq75J+AVF3oBnWD/dwnDHb+Qai8QcNsZ6AcsYOdq1zzqMsbNcOdVJz lQDdzfDwRYaoge++VRua0PQhxYPdEne9g5dddAap7ndNpb+MlilsYbj6eDMpFQMn4ied 0fK15VanoHBafLic4xE/MIm/Ba+n2U9NVLajLuEu95Gj8tVfVny1P7m/sq5R/QynMMlI Sj/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mmnCTUDE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id k19-20020a056a00169300b0052f80d1a588si17664628pfc.44.2022.10.19.02.03.17; Wed, 19 Oct 2022 02:04:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=mmnCTUDE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230138AbiJSIwT (ORCPT + 99 others); Wed, 19 Oct 2022 04:52:19 -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 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747106136667895586?= X-GMAIL-MSGID: =?utf-8?q?1747106136667895586?= 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);