diff mbox series

[5.5,030/119] riscv: Force flat memory model with no-mmu

Message ID	20200324130811.391353825@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=FSPt=5J=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Damien Le Moal <damien.lemoal@wdc.com>, Anup Patel <anup@brainfault.org>, Palmer Dabbelt <palmerdabbelt@google.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.5 030/119] riscv: Force flat memory model with no-mmu Date: Tue, 24 Mar 2020 14:10:15 +0100 Message-Id: <20200324130811.391353825@linuxfoundation.org> In-Reply-To: <20200324130808.041360967@linuxfoundation.org> References: <20200324130808.041360967@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk
Series	None \| expand [5.5,003/119] spi: spi-omap2-mcspi: Support probe deferral for DMA channels [5.5,005/119] drm/mediatek: Ensure the cursor plane is on top of other overlays [5.5,008/119] ARM: dts: dra7-l4: mark timer13-16 as pwm capable [5.5,012/119] cifs: add missing mount option to /proc/mounts [5.5,013/119] ARM: dts: dra7: Add "dma-ranges" property to PCIe RC DT nodes [5.5,015/119] spi/zynqmp: remove entry that causes a cs glitch [5.5,018/119] drm/exynos: dsi: fix workaround for the legacy clock name [5.5,019/119] drm/exynos: hdmi: dont leak enable HDMI_EN regulator if probe fails [5.5,020/119] drivers/perf: fsl_imx8_ddr: Correct the CLEAR bit definition [5.5,024/119] altera-stapl: altera_get_note: prevent write beyond end of key [5.5,026/119] dm integrity: use dm_bio_record and dm_bio_restore [5.5,027/119] riscv: avoid the PIC offset of static percpu data in module beyond 2G limits [5.5,030/119] riscv: Force flat memory model with no-mmu [5.5,031/119] riscv: Fix range looking for kernel image memblock [5.5,034/119] drm/amd/display: fix dcc swath size calculations on dcn1 [5.5,035/119] xenbus: req->body should be updated before req->state [5.5,037/119] riscv: fix seccomp reject syscall code path [5.5,040/119] binderfs: use refcount for binder control devices too [5.5,044/119] USB: serial: option: add ME910G1 ECM composition 0x110b [5.5,046/119] usb: host: xhci-plat: add a shutdown [5.5,048/119] usb: xhci: apply XHCI_SUSPEND_DELAY to AMD XHCI controller 1022:145c [5.5,050/119] usb: typec: ucsi: displayport: Fix a potential race during registration [5.5,052/119] USB: cdc-acm: fix rounding error in TIOCSSERIAL [5.5,054/119] ALSA: hda/realtek - Enable headset mic of Acer X2660G with ALC662 [5.5,055/119] ALSA: hda/realtek - Enable the headset of Acer N50-600 with ALC662 [5.5,057/119] ALSA: seq: oss: Fix running status after receiving sysex [5.5,059/119] ALSA: pcm: oss: Remove WARNING from snd_pcm_plug_alloc() checks [5.5,062/119] iio: chemical: sps30: fix missing triggered buffer dependency [5.5,064/119] iio: trigger: stm32-timer: disable master mode when stopping [5.5,065/119] iio: accel: adxl372: Set iio_chan BE [5.5,067/119] iio: adc: stm32-dfsdm: fix sleep in atomic context [5.5,068/119] iio: adc: at91-sama5d2_adc: fix differential channels in triggered mode [5.5,070/119] iio: light: vcnl4000: update sampling periods for vcnl4040 [5.5,072/119] mmc: sdhci-of-at91: fix cd-gpios for SAMA5D2 [5.5,073/119] mmc: sdhci-cadence: set SDHCI_QUIRK2_PRESET_VALUE_BROKEN for UniPhier [5.5,076/119] CIFS: fiemap: do not return EINVAL if get nothing [5.5,077/119] kbuild: Disable -Wpointer-to-enum-cast [5.5,078/119] staging: rtl8188eu: Add device id for MERCUSYS MW150US v2 [5.5,079/119] staging: greybus: loopback_test: fix poll-mask build breakage [5.5,080/119] staging/speakup: fix get_word non-space look-ahead [5.5,081/119] intel_th: msu: Fix the unexpected state warning [5.5,083/119] intel_th: pci: Add Elkhart Lake CPU support [5.5,084/119] modpost: move the namespace field in Module.symvers last [5.5,085/119] rtc: max8907: add missing select REGMAP_IRQ [5.5,088/119] btrfs: fix log context list corruption after rename whiteout error [5.5,092/119] memcg: fix NULL pointer dereference in __mem_cgroup_usage_unregister_event [5.5,093/119] mm, memcg: fix corruption on 64-bit divisor in memory.high throttling [5.5,094/119] mm, memcg: throttle allocators based on ancestral memory.high [5.5,096/119] mm: do not allow MADV_PAGEOUT for CoW pages [5.5,099/119] mm, slub: prevent kmalloc_node crashes and memory leaks [5.5,103/119] futex: Fix inode life-time issue [5.5,105/119] ALSA: hda/realtek: Fix pop noise on ALC225 [5.5,106/119] thunderbolt: Fix error code in tb_port_is_width_supported() [5.5,108/119] arm64: smp: fix crash_smp_send_stop() behaviour [5.5,111/119] btrfs: fix removal of raid[56\|1c34} incompat flags after removing block group [5.5,113/119] drm/bridge: dw-hdmi: fix AVI frame colorimetry [5.5,115/119] drm/i915: Handle all MCR ranges [5.5,119/119] int128: fix __uint128_t compiler test in Kconfig

Commit Message

Greg Kroah-Hartman March 24, 2020, 1:10 p.m. UTC

From: Damien Le Moal <damien.lemoal@wdc.com>

[ Upstream commit aa2734202acc506d09c8e641db4da161f902df27 ]

Compilation errors trigger if ARCH_SPARSEMEM_ENABLE is enabled for
a nommu kernel. Since the sparsemem model does not make sense anyway
for the nommu case, do not allow selecting this option to always use
the flatmem model.

Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/riscv/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff mbox series

Patch

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index fa7dc03459e7f..1be11c23fa335 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -121,6 +121,7 @@  config ARCH_FLATMEM_ENABLE
 
 config ARCH_SPARSEMEM_ENABLE
 	def_bool y
+	depends on MMU
 	select SPARSEMEM_VMEMMAP_ENABLE
 
 config ARCH_SELECT_MEMORY_MODEL