diff mbox series

[5.10,055/157] riscv: Correct SPARSEMEM configuration

Message ID	20210322121935.499402986@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <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, Kefeng Wang <wangkefeng.wang@huawei.com>, Palmer Dabbelt <palmerdabbelt@google.com> Subject: [PATCH 5.10 055/157] riscv: Correct SPARSEMEM configuration Date: Mon, 22 Mar 2021 13:26:52 +0100 Message-Id: <20210322121935.499402986@linuxfoundation.org> In-Reply-To: <20210322121933.746237845@linuxfoundation.org> References: <20210322121933.746237845@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,002/157] ASoC: ak5558: Add MODULE_DEVICE_TABLE [5.10,003/157] spi: cadence: set cqspi to the driver_data field of struct device [5.10,004/157] ALSA: dice: fix null pointer dereference when node is disconnected [5.10,007/157] ALSA: hda/realtek: Apply headset-mic quirks for Xiaomi Redmibook Air [5.10,008/157] ALSA: hda/realtek: fix mute/micmute LEDs for HP 840 G8 [5.10,011/157] Revert "PM: runtime: Update device status before letting suppliers suspend" [5.10,014/157] s390/pci: remove superfluous zdev->zbus check [5.10,015/157] s390/pci: fix leak of PCI device structure [5.10,017/157] zonefs: prevent use of seq files as swap file [5.10,018/157] zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone() [5.10,020/157] btrfs: fix slab cache flags for free space tree bitmap [5.10,022/157] vhost-vdpa: set v->config_ctx to NULL if eventfd_ctx_fdget() fails [5.10,028/157] ASoC: qcom: sdm845: Fix array out of bounds access [5.10,029/157] ASoC: qcom: sdm845: Fix array out of range on rx slim channels [5.10,030/157] ASoC: codecs: wcd934x: add a sanity check in set channel map [5.10,031/157] ASoC: qcom: lpass-cpu: Fix lpass dai ids parse [5.10,033/157] afs: Fix accessing YFS xattrs on a non-YFS server [5.10,037/157] nvme-tcp: fix misuse of __smp_processor_id with preemption enabled [5.10,038/157] nvme-tcp: fix possible hang when failing to set io queues [5.10,039/157] nvme-tcp: fix a NULL deref when receiving a 0-length r2t PDU [5.10,042/157] nfsd: dont abort copies early [5.10,044/157] NFSD: fix dest to src mount in inter-server COPY [5.10,045/157] svcrdma: disable timeouts on rdma backchannel [5.10,047/157] vhost_vdpa: fix the missing irq_bypass_unregister_producer() invocation [5.10,050/157] pstore: Fix warning in pstore_kill_sb() [5.10,053/157] kbuild: Fix <linux/version.h> for empty SUBLEVEL or PATCHLEVEL again [5.10,055/157] riscv: Correct SPARSEMEM configuration [5.10,056/157] scsi: lpfc: Fix some error codes in debugfs [5.10,058/157] scsi: ufs: ufs-mediatek: Correct operator & -> && [5.10,059/157] RISC-V: correct enum sbi_ext_rfence_fid [5.10,061/157] gpiolib: Assign fwnode to parents if no primary one provided [5.10,062/157] nvme-rdma: fix possible hang when failing to set io queues [5.10,064/157] ibmvnic: serialize access to work queue on remove [5.10,067/157] bpf: Declare __bpf_free_used_maps() unconditionally [5.10,072/157] module: merge repetitive strings in module_sig_check() [5.10,073/157] module: avoid gotos in module_sig_check() [5.10,075/157] scsi: pm80xx: Make mpi_build_cmd locking consistent [5.10,077/157] scsi: pm80xx: Fix pm8001_mpi_get_nvmd_resp() race condition [5.10,078/157] scsi: pm8001: Neaten debug logging macros and uses [5.10,079/157] scsi: libsas: Remove notifier indirection [5.10,081/157] scsi: mvsas: Pass gfp_t flags to libsas event notifiers [5.10,084/157] scsi: isci: Pass gfp_t flags in isci_port_bc_change_received() [5.10,085/157] RDMA/mlx5: Allow creating all QPs even when non RDMA profile is used [5.10,086/157] powerpc/sstep: Fix load-store and update emulation [5.10,090/157] MIPS: compressed: fix build with enabled UBSAN [5.10,091/157] drm/amd/display: turn DPMS off on connector unplug [5.10,093/157] entry: Explicitly flush pending rcuog wakeup before last rescheduling point [5.10,095/157] iwlwifi: Add a new card for MA family [5.10,096/157] mptcp: split mptcp_clean_una function [5.10,097/157] mptcp: reduce the arguments of mptcp_sendmsg_frag [5.10,099/157] media: cedrus: h264: Support profile controls [5.10,102/157] drm/amd/pm: fulfill the Polaris implementation for get_clock_by_type_with_latency() [5.10,105/157] io_uring: dont attempt IO reissue from the ring exit path [5.10,106/157] io_uring: clear IOCB_WAITQ for non -EIOCBQUEUED return [5.10,108/157] net: bonding: fix error return code of bond_neigh_init() [5.10,109/157] regulator: pca9450: Add SD_VSEL GPIO for LDO5 [5.10,111/157] regulator: pca9450: Clear PRESET_EN bit to fix BUCK1/2/3 voltage setting [5.10,113/157] gfs2: move freeze glock outside the make_fs_rw and _ro functions [5.10,115/157] powerpc: Force inlining of cpu_has_feature() to avoid build failure [5.10,116/157] usb-storage: Add quirk to defeat Kindles automatic unload [5.10,119/157] usb: typec: Remove vdo[3] part of tps6598x_rx_identity_reg struct [5.10,120/157] usb: typec: tcpm: Invoke power_supply_changed for tcpm-source-psy- [5.10,121/157] usb: dwc3: gadget: Allow runtime suspend if UDC unbinded [5.10,123/157] thunderbolt: Initialize HopID IDAs in tb_switch_alloc() [5.10,125/157] iio:adc:stm32-adc: Add HAS_IOMEM dependency [5.10,127/157] iio: adis16400: Fix an error code in adis16400_initial_setup() [5.10,128/157] iio: gyro: mpu3050: Fix error handling in mpu3050_trigger_handler [5.10,129/157] iio: adc: ab8500-gpadc: Fix off by 10 to 3 [5.10,130/157] iio: adc: ad7949: fix wrong ADC result due to incorrect bit mask [5.10,135/157] counter: stm32-timer-cnt: fix ceiling write max value [5.10,137/157] PCI: rpadlpar: Fix potential drc_name corruption in store functions [5.10,138/157] perf/x86/intel: Fix a crash caused by zero PEBS status [5.10,141/157] kernel, fs: Introduce and use set_restart_fn() and arch_set_restart_data() [5.10,142/157] x86: Move TS_COMPAT back to asm/thread_info.h [5.10,143/157] x86: Introduce TS_COMPAT_RESTART to fix get_nr_restart_syscall() [5.10,144/157] efivars: respect EFI_UNSUPPORTED return from firmware [5.10,147/157] ext4: stop inode update before return [5.10,149/157] ext4: fix potential error in ext4_do_update_inode [5.10,152/157] MAINTAINERS: move the staging subsystem to lists.linux.dev [5.10,156/157] genirq: Disable interrupts for force threaded handlers

Commit Message

Greg Kroah-Hartman March 22, 2021, 12:26 p.m. UTC

From: Kefeng Wang <wangkefeng.wang@huawei.com>

commit a5406a7ff56e63376c210b06072aa0ef23473366 upstream.

There are two issues for RV32,
1) if use FLATMEM, it is useless to enable SPARSEMEM_STATIC.
2) if use SPARSMEM, both SPARSEMEM_VMEMMAP and SPARSEMEM_STATIC is enabled.

Fixes: d95f1a542c3d ("RISC-V: Implement sparsemem")
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 arch/riscv/Kconfig |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -84,7 +84,6 @@  config RISCV
 	select PCI_MSI if PCI
 	select RISCV_INTC
 	select RISCV_TIMER if RISCV_SBI
-	select SPARSEMEM_STATIC if 32BIT
 	select SPARSE_IRQ
 	select SYSCTL_EXCEPTION_TRACE
 	select THREAD_INFO_IN_TASK
@@ -145,7 +144,8 @@  config ARCH_FLATMEM_ENABLE
 config ARCH_SPARSEMEM_ENABLE
 	def_bool y
 	depends on MMU
-	select SPARSEMEM_VMEMMAP_ENABLE
+	select SPARSEMEM_STATIC if 32BIT && SPARSMEM
+	select SPARSEMEM_VMEMMAP_ENABLE if 64BIT
 
 config ARCH_SELECT_MEMORY_MODEL
 	def_bool ARCH_SPARSEMEM_ENABLE