diff mbox series

[4.4,42/93] powerpc/47x: Disable 256k page size

Message ID	20210301161008.971571099@linuxfoundation.org
State	New
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.4 42/93] powerpc/47x: Disable 256k page size Date: Mon, 1 Mar 2021 17:12:54 +0100 Message-Id: <20210301161008.971571099@linuxfoundation.org> In-Reply-To: <20210301161006.881950696@linuxfoundation.org> References: <20210301161006.881950696@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.4,03/93] xen-netback: delete NAPI instance when queue fails to initialize [4.4,07/93] kdb: Make memory allocations more robust [4.4,09/93] Bluetooth: Fix initializing response id after clearing struct [4.4,10/93] ARM: dts: exynos: correct PMIC interrupt trigger level on Spring [4.4,11/93] ARM: dts: exynos: correct PMIC interrupt trigger level on Arndale Octa [4.4,13/93] Bluetooth: Put HCI device if inquiry procedure interrupts [4.4,14/93] usb: dwc2: Abort transaction after errors with unknown reason [4.4,16/93] ARM: s3c: fix fiq for clang IAS [4.4,18/93] xen/netback: fix spurious event detection for common event case [4.4,19/93] b43: N-PHY: Fix the update of coef for the PHY revision >= 3case [4.4,21/93] drm/gma500: Fix error return code in psb_driver_load() [4.4,22/93] gma500: clean up error handling in init [4.4,23/93] MIPS: c-r4k: Fix section mismatch for loongson2_sc_init [4.4,25/93] media: media/pci: Fix memleak in empress_init [4.4,27/93] ASoC: cs42l56: fix up error handling in probe [4.4,29/93] media: cx25821: Fix a bug when reallocating some dma memory [4.4,33/93] jffs2: fix use after free in jffs2_sum_write_data() [4.4,34/93] clk: meson: clk-pll: fix initializing the old rate (fallback) for a PLL [4.4,37/93] dmaengine: fsldma: Fix a resource leak in an error handling path of the probe function [4.4,40/93] isofs: release buffer head before return [4.4,41/93] IB/umad: Return EIO in case of when device disassociated [4.4,42/93] powerpc/47x: Disable 256k page size [4.4,46/93] tracepoint: Do not fail unregistering a probe due to memory failure [4.4,47/93] mfd: wm831x-auxadc: Prevent use after free in wm831x_auxadc_read_irq() [4.4,48/93] powerpc/pseries/dlpar: handle ibm, configure-connector delay status [4.4,49/93] perf intel-pt: Fix missing CYC processing in PSB [4.4,51/93] Input: elo - fix an error code in elo_connect() [4.4,53/93] misc: eeprom_93xx46: Fix module alias to enable module autoprobe [4.4,56/93] PCI: Align checking of syscall user config accessors [4.4,57/93] Take mmap lock in cacheflush syscall [4.4,58/93] mm/memory.c: fix potential pte_unmap_unlock pte error [4.4,60/93] i2c: brcmstb: Fix brcmstd_send_i2c_cmd condition [4.4,61/93] scsi: bnx2fc: Fix Kconfig warning & CNIC build errors [4.4,63/93] blk-settings: align max_sectors on "logical_block_size" boundary [4.4,64/93] Input: xpad - add support for PowerA Enhanced Wired Controller for Xbox Series X\|S [4.4,65/93] Input: joydev - prevent potential read overflow in ioctl [4.4,71/93] usb: dwc3: gadget: Fix dep->interval for fullspeed interrupt [4.4,72/93] KEYS: trusted: Fix migratable=1 failing [4.4,74/93] drivers/misc/vmw_vmci: restrict too big queue size in qp_host_alloc_queue [4.4,76/93] x86/reboot: Force all cpus to exit VMX root if VMX is supported [4.4,80/93] libnvdimm/dimm: Avoid race between probe and available_slots_show() [4.4,81/93] module: Ignore _GLOBAL_OFFSET_TABLE_ when warning for undefined symbols [4.4,83/93] f2fs: fix out-of-repair __setattr_copy() [4.4,87/93] dm era: Verify the data block size hasnt changed [4.4,88/93] dm era: Fix bitset memory leaks [4.4,89/93] dm era: Use correct value size in equality function of writeset tree [4.4,92/93] futex: Fix OWNER_DEAD fixup

Commit Message

Greg Kroah-Hartman 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 4ece20178145d..735f99906a320 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -577,7 +577,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.