From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24CB5C433ED for ; Mon, 19 Apr 2021 20:47:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EAFD9613B0 for ; Mon, 19 Apr 2021 20:47:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240560AbhDSUrx (ORCPT ); Mon, 19 Apr 2021 16:47:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:54566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242443AbhDSUpW (ORCPT ); Mon, 19 Apr 2021 16:45:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2FF83613BC; Mon, 19 Apr 2021 20:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1618865087; bh=czNKm0mqDxsUeA3xKoBQNmTrg6kgyI/Wl2LfDy6++18=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qjq7Vq1W8OiX318Sg4blDdFSa5iqJDc2bINzj0PGfd055rgebHwg/ocipvjqrUG4v K0bSSb3EGl5xmclB6FcwvCm20iFUYVKnCORI/eGvVfWBNWU2mPvugz9aM1iNSEU4j8 rqwiNIdTPe2/TTDfcY/gGOrPY7cfuqVDlHbLynJHV1B6rwX/VJKrZgF2Ye49qxkPYm jx+C14IIlReWdYq00U7FkrgC6oc70H7e05cwY79V7B5dfuC+Geu2Nd/Q4BU28+fX1g mY8Hccl4wtpOpvuHiXo8oWa1G+0GCOUUIeIqtO7fR41B5Z2qUGeCJokITFSdDJlS9u DwkLgMbova4+w== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Randy Dunlap , kernel test robot , Guo Ren , Jesse Brandeburg , Andrew Morton , Linus Torvalds , Sasha Levin , linux-csky@vger.kernel.org Subject: [PATCH AUTOSEL 5.10 17/21] csky: change a Kconfig symbol name to fix e1000 build error Date: Mon, 19 Apr 2021 16:44:15 -0400 Message-Id: <20210419204420.6375-17-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210419204420.6375-1-sashal@kernel.org> References: <20210419204420.6375-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Randy Dunlap [ Upstream commit d199161653d612b8fb96ac51bfd5b2d2782ecef3 ] e1000's #define of CONFIG_RAM_BASE conflicts with a Kconfig symbol in arch/csky/Kconfig. The symbol in e1000 has been around longer, so change arch/csky/ to use DRAM_BASE instead of RAM_BASE to remove the conflict. (although e1000 is also a 2-line change) Link: https://lkml.kernel.org/r/20210411055335.7111-1-rdunlap@infradead.org Signed-off-by: Randy Dunlap Reported-by: kernel test robot Acked-by: Guo Ren Cc: Jesse Brandeburg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- arch/csky/Kconfig | 2 +- arch/csky/include/asm/page.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig index 268fad5f51cf..7bf0a617e94c 100644 --- a/arch/csky/Kconfig +++ b/arch/csky/Kconfig @@ -292,7 +292,7 @@ config FORCE_MAX_ZONEORDER int "Maximum zone order" default "11" -config RAM_BASE +config DRAM_BASE hex "DRAM start addr (the same with memory-section in dts)" default 0x0 diff --git a/arch/csky/include/asm/page.h b/arch/csky/include/asm/page.h index 9b98bf31d57c..16878240ef9a 100644 --- a/arch/csky/include/asm/page.h +++ b/arch/csky/include/asm/page.h @@ -28,7 +28,7 @@ #define SSEG_SIZE 0x20000000 #define LOWMEM_LIMIT (SSEG_SIZE * 2) -#define PHYS_OFFSET_OFFSET (CONFIG_RAM_BASE & (SSEG_SIZE - 1)) +#define PHYS_OFFSET_OFFSET (CONFIG_DRAM_BASE & (SSEG_SIZE - 1)) #ifndef __ASSEMBLY__ -- 2.30.2