diff mbox series

[4.9,060/134] powerpc/47x: Disable 256k page size

Message ID	20210301161016.506381970@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, kernel test robot <lkp@intel.com>, Christophe Leroy <christophe.leroy@csgroup.eu>, Michael Ellerman <mpe@ellerman.id.au>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.9 060/134] powerpc/47x: Disable 256k page size Date: Mon, 1 Mar 2021 17:12:41 +0100 Message-Id: <20210301161016.506381970@linuxfoundation.org> In-Reply-To: <20210301161013.585393984@linuxfoundation.org> References: <20210301161013.585393984@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 [4.9,003/134] ntfs: check for valid standard information attribute [4.9,006/134] NET: usb: qmi_wwan: Adding support for Cinterion MV31 [4.9,007/134] cifs: Set CIFS_MOUNT_USE_PREFIX_PATH flag on setting cifs_sb->prepath. [4.9,008/134] scripts/recordmcount.pl: support big endian for ARCH sh [4.9,009/134] kdb: Make memory allocations more robust [4.9,013/134] Bluetooth: Fix initializing response id after clearing struct [4.9,014/134] ARM: dts: exynos: correct PMIC interrupt trigger level on Spring [4.9,015/134] ARM: dts: exynos: correct PMIC interrupt trigger level on Arndale Octa [4.9,017/134] Bluetooth: drop HCI device reference before return [4.9,019/134] ARM: dts: Configure missing thermal interrupt for 4430 [4.9,022/134] usb: dwc2: Make "trimming xfer length" a debug message [4.9,024/134] ARM: s3c: fix fiq for clang IAS [4.9,026/134] xen/netback: fix spurious event detection for common event case [4.9,031/134] gma500: clean up error handling in init [4.9,032/134] MIPS: c-r4k: Fix section mismatch for loongson2_sc_init [4.9,033/134] MIPS: lantiq: Explicitly compare LTQ_EBU_PCC_ISTAT against 0 [4.9,035/134] media: media/pci: Fix memleak in empress_init [4.9,038/134] media: lmedm04: Fix misuse of comma [4.9,040/134] media: cx25821: Fix a bug when reallocating some dma memory [4.9,041/134] media: pxa_camera: declare variable when DEBUG is defined [4.9,042/134] media: uvcvideo: Accept invalid bFormatIndex and bFrameIndex values [4.9,043/134] ata: ahci_brcm: Add back regulators management [4.9,044/134] btrfs: clarify error returns values in __load_free_space_cache [4.9,045/134] crypto: ecdh_helper - Ensure len >= secret.len in decode_key() [4.9,046/134] fs/jfs: fix potential integer overflow on shift of a int [4.9,048/134] clk: meson: clk-pll: fix initializing the old rate (fallback) for a PLL [4.9,049/134] spi: cadence-quadspi: Abort read if dummy cycles required are too many [4.9,050/134] HID: core: detect and skip invalid inputs to snto32() [4.9,052/134] dmaengine: fsldma: Fix a resource leak in an error handling path of the probe function [4.9,053/134] fdt: Properly handle "no-map" field in the memory region [4.9,055/134] power: reset: at91-sama5d2_shdwc: fix wkupdbc mask [4.9,059/134] IB/umad: Return EIO in case of when device disassociated [4.9,060/134] powerpc/47x: Disable 256k page size [4.9,064/134] tracepoint: Do not fail unregistering a probe due to memory failure [4.9,068/134] powerpc/pseries/dlpar: handle ibm, configure-connector delay status [4.9,073/134] sparc64: only select COMPAT_BINFMT_ELF if BINFMT_ELF is set [4.9,077/134] VMCI: Use set_page_dirty_lock() when unregistering guest memory [4.9,078/134] PCI: Align checking of syscall user config accessors [4.9,081/134] Take mmap lock in cacheflush syscall [4.9,083/134] ocfs2: fix a use after free on error [4.9,085/134] mm/hugetlb: fix potential double free in hugetlb_register_node() error path [4.9,086/134] arm64: Add missing ISB after invalidating TLB in __primary_switch [4.9,087/134] i2c: brcmstb: Fix brcmstd_send_i2c_cmd condition [4.9,091/134] Input: raydium_ts_i2c - do not send zero length [4.9,094/134] Input: i8042 - add ASUS Zenbook Flip to noselftest list [4.9,097/134] USB: serial: mos7840: fix error code in mos7840_write() [4.9,098/134] USB: serial: mos7720: fix error code in mos7720_write() [4.9,099/134] usb: dwc3: gadget: Fix setting of DEPCFG.bInterval_m1 [4.9,100/134] usb: dwc3: gadget: Fix dep->interval for fullspeed interrupt [4.9,103/134] btrfs: fix reloc root leak with 0 ref reloc roots on recovery [4.9,105/134] seccomp: Add missing return in non-void function [4.9,106/134] drivers/misc/vmw_vmci: restrict too big queue size in qp_host_alloc_queue [4.9,107/134] staging: rtl8188eu: Add Edimax EW-7811UN V2 to device table [4.9,108/134] x86/reboot: Force all cpus to exit VMX root if VMX is supported [4.9,109/134] floppy: reintroduce O_NDELAY fix [4.9,112/134] usb: renesas_usbhs: Clear pipe running flag in usbhs_pkt_pop() [4.9,114/134] module: Ignore _GLOBAL_OFFSET_TABLE_ when warning for undefined symbols [4.9,116/134] gpio: pcf857x: Fix missing first interrupt [4.9,118/134] sparc32: fix a user-triggerable oops in clear_user() [4.9,120/134] dm era: Recover committed writeset after crash [4.9,122/134] dm era: Fix bitset memory leaks [4.9,123/134] dm era: Use correct value size in equality function of writeset tree [4.9,124/134] dm era: Reinitialize bitset cache before digesting a new writeset [4.9,125/134] dm era: only resize metadata in preresume [4.9,126/134] futex: Fix OWNER_DEAD fixup [4.9,128/134] icmp: introduce helper for natd source address in network device context [4.9,129/134] gtp: use icmp_ndo_send helper [4.9,130/134] sunvnet: use icmp_ndo_send helper [4.9,131/134] ipv6: icmp6: avoid indirect call for icmpv6_send() [4.9,133/134] net: icmp: pass zeroed opts from icmp{,v6}_ndo_send before sending

Commit Message

Greg KH March 1, 2021, 4:12 p.m. UTC

From: Christophe Leroy <christophe.leroy@csgroup.eu>

[ Upstream commit 910a0cb6d259736a0c86e795d4c2f42af8d0d775 ]

PPC47x_TLBE_SIZE isn't defined for 256k pages, leading to a build
break if 256k pages is selected.

So change the kconfig so that 256k pages can't be selected for 47x.

Fixes: e7f75ad01d59 ("powerpc/47x: Base ppc476 support")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
[mpe: Expand change log to mention build break]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/2fed79b1154c872194f98bac4422c23918325e61.1611128938.git.christophe.leroy@csgroup.eu
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 arch/powerpc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index f529d3d9d88d7..6a06411f9bf14 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -622,7 +622,7 @@  config PPC_64K_PAGES
 
 config PPC_256K_PAGES
 	bool "256k page size"
-	depends on 44x && !STDBINUTILS
+	depends on 44x && !STDBINUTILS && !PPC_47x
 	help
 	  Make the page size 256k.