From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Randy Dunlap <rdunlap@infradead.org>,
kernel test robot <lkp@intel.com>, Guo Ren <guoren@kernel.org>,
Jesse Brandeburg <jesse.brandeburg@intel.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Sasha Levin <sashal@kernel.org>,
linux-csky@vger.kernel.org
Subject: [PATCH AUTOSEL 5.11 19/23] csky: change a Kconfig symbol name to fix e1000 build error
Date: Mon, 19 Apr 2021 16:43:38 -0400 [thread overview]
Message-ID: <20210419204343.6134-19-sashal@kernel.org> (raw)
In-Reply-To: <20210419204343.6134-1-sashal@kernel.org>
From: Randy Dunlap <rdunlap@infradead.org>
[ 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 <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Acked-by: Guo Ren <guoren@kernel.org>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 89dd2fcf38fa..3b16d081b4d7 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
next prev parent reply other threads:[~2021-04-19 20:44 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-19 20:43 [PATCH AUTOSEL 5.11 01/23] HID: google: add don USB id Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 02/23] HID: asus: Add support for 2021 ASUS N-Key keyboard Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 03/23] HID: alps: fix error return code in alps_input_configured() Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 04/23] HID cp2112: fix support for multiple gpiochips Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 05/23] HID: wacom: Assign boolean values to a bool variable Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 06/23] soc: qcom: geni: shield geni_icc_get() for ACPI boot Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 07/23] dmaengine: xilinx: dpdma: Fix descriptor issuing on video group Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 08/23] dmaengine: xilinx: dpdma: Fix race condition in done IRQ Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 09/23] ARM: dts: Fix swapped mmc order for omap3 Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 10/23] m68k: fix flatmem memory model setup Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 11/23] net: geneve: check skb is large enough for IPv4/IPv6 header Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 12/23] dmaengine: tegra20: Fix runtime PM imbalance on error Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 13/23] s390/entry: save the caller of psw_idle Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 14/23] arm64: kprobes: Restore local irqflag if kprobes is cancelled Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 15/23] xen-netback: Check for hotplug-status existence before watching Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 16/23] cavium/liquidio: Fix duplicate argument Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 17/23] i2c: mv64xxx: Fix random system lock caused by runtime PM Sasha Levin
2021-04-20 6:30 ` Marek Behún
2021-04-25 21:41 ` Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 18/23] kasan: fix hwasan build for gcc Sasha Levin
2021-04-19 20:43 ` Sasha Levin [this message]
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 20/23] ia64: fix discontig.c section mismatches Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 21/23] ia64: tools: remove duplicate definition of ia64_mf() on ia64 Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 22/23] gcov: clang: fix clang-11+ build Sasha Levin
2021-04-19 20:43 ` [PATCH AUTOSEL 5.11 23/23] readdir: make sure to verify directory entry for legacy interfaces too Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210419204343.6134-19-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=guoren@kernel.org \
--cc=jesse.brandeburg@intel.com \
--cc=linux-csky@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.com \
--cc=rdunlap@infradead.org \
--cc=stable@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).