Mike Rapoport
17d6ece980
mips: fix build when "48 bits virtual memory" is enabled ...
[ Upstream commit 3ed6751bb8fa89c3014399bb0414348499ee202a ]
With CONFIG_MIPS_VA_BITS_48=y the build fails miserably:
CC arch/mips/kernel/asm-offsets.s
In file included from arch/mips/include/asm/pgtable.h:644,
from include/linux/mm.h:99,
from arch/mips/kernel/asm-offsets.c:15:
include/asm-generic/pgtable.h:16:2: error: #error CONFIG_PGTABLE_LEVELS is not consistent with __PAGETABLE_{P4D,PUD,PMD}_FOLDED
#error CONFIG_PGTABLE_LEVELS is not consistent with __PAGETABLE_{P4D,PUD,PMD}_FOLDED
^~~~~
include/asm-generic/pgtable.h:390:28: error: unknown type name 'p4d_t'; did you mean 'pmd_t'?
static inline int p4d_same(p4d_t p4d_a, p4d_t p4d_b)
^~~~~
pmd_t
[ ... more such errors ... ]
scripts/Makefile.build:99: recipe for target 'arch/mips/kernel/asm-offsets.s' failed
make[2]: *** [arch/mips/kernel/asm-offsets.s] Error 1
This happens because when CONFIG_MIPS_VA_BITS_48 enables 4th level of the
page tables, but neither pgtable-nop4d.h nor 5level-fixup.h are included to
cope with the 5th level.
Replace #ifdef conditions around includes of the pgtable-nop{m,u}d.h with
explicit CONFIG_PGTABLE_LEVELS and add include of 5level-fixup.h for the
case when CONFIG_PGTABLE_LEVELS==4
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Paul Burton <paulburton@kernel.org>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: James Hogan <jhogan@kernel.org>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-mm@kvack.org
Cc: Mike Rapoport <rppt@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
2019-12-31 16:36:14 +01:00
mips: unify prom_putchar() declarations
2018-07-17 09:40:17 -07:00
mips: unify prom_putchar() declarations
2018-07-17 09:40:17 -07:00
mips: unify prom_putchar() declarations
2018-07-17 09:40:17 -07:00
Revert "MIPS: perf: ath79: Fix perfcount IRQ assignment"
2019-06-11 12:20:53 +02:00
MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3
2019-11-20 18:45:35 +01:00
MIPS: BCM63XX: fix switch core reset on BCM6368
2019-11-20 18:45:10 +01:00
MIPS: bmips: remove unnecessary call to register "simple-bus"
2018-06-24 09:27:27 -07:00
MIPS: dts: ar9331: fix interrupt-controller size
2019-10-29 09:19:32 +01:00
MIPS: OCTEON: cvmx_pko_mem_debug8: use oldest forward compatible definition
2019-12-13 08:52:26 +01:00
MIPS: Cobalt: Fix typo
2016-08-03 08:16:30 +02:00
USB: rio500: Remove Rio 500 kernel driver
2019-10-17 13:44:47 -07:00
MIPS: crypto: Add crc32 and crc32c hw accelerated module
2018-02-19 20:50:36 +00:00
MIPS: Convert update_persistent_clock() to update_persistent_clock64()
2018-05-14 23:58:23 +01:00
MIPS: Avoid old-style declaration
2017-01-25 02:51:11 +01:00
MIPS: fw: sni: Fix out of bounds init of o32 stack
2019-11-06 13:06:04 +01:00
MIPS: Remove obsolete MIPS checks for DST node "chosen@0"
2018-08-06 09:50:33 -07:00
mips: fix build when "48 bits virtual memory" is enabled
2019-12-31 16:36:14 +01:00
MIPS: jazz: fix 64bit build
2019-02-27 10:08:53 +01:00
MIPS: lb60: Fix pin mappings
2019-07-28 08:29:28 +02:00
MIPS: bmips: mark exception vectors as char arrays
2019-11-10 11:27:31 +01:00
KVM: s390: Do not report unusabled IDs via KVM_CAP_MAX_VCPU_ID
2019-06-09 09:17:18 +02:00
MIPS: lantiq: Fix bitfield masking
2019-08-06 19:06:48 +02:00
kbuild: rename LDFLAGS to KBUILD_LDFLAGS
2018-08-24 08:22:08 +09:00
MIPS: memset: Fix CPU_DADDI_WORKAROUNDS `small_fixup' regression
2018-10-05 09:41:39 -07:00
MIPS: Loongson: Merge load addresses
2018-07-30 18:59:01 -07:00
mips: Loongson: Fix the link time qualifier of 'serial_exit()'
2019-10-29 09:19:35 +01:00
MIPS: math-emu: Write-protect delay slot emulation pages
2019-01-09 17:38:47 +01:00
MIPS: tlbex: Fix build_restore_pagemask KScratch restore
2019-10-29 09:19:47 +01:00
MIPS: Malta: Use PIIX4 poweroff driver to power down
2018-06-24 09:27:27 -07:00
MIPS: eBPF: Fix icache flush end address
2019-03-05 17:58:54 +01:00
mips: unify prom_putchar() declarations
2018-07-17 09:40:17 -07:00
MIPS: perf: More robustly probe for the presence of per-tc counters
2018-05-15 15:16:16 +01:00
mips: unify prom_putchar() declarations
2018-07-17 09:40:17 -07:00
MIPS: OCTEON: don't set octeon_dma_bar_type if PCI is disabled
2019-02-15 08:10:11 +01:00
mips: unify prom_putchar() declarations
2018-07-17 09:40:17 -07:00
MIPS: pistachio: Build uImage.gz by default
2019-06-11 12:20:53 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
mtd: nand: Rename nand.h into rawnand.h
2017-08-13 10:11:49 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
MIPS: ralink: Select CONFIG_CPU_MIPSR2_IRQ_VI on MT7620/8
2019-02-12 19:47:17 +01:00
MIPS: RB532: Avoid undefined mac_pton without GENERIC_NET_UTILS
2018-01-10 16:39:03 +01:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-11-13 17:56:58 -08:00
mips: unify prom_putchar() declarations
2018-07-17 09:40:17 -07:00
MIPS: IP32: use generic dma noncoherent ops
2018-06-24 09:27:27 -07:00
MIPS: SiByte: Enable swiotlb for SWARM, LittleSur and BigSur
2019-01-26 09:32:35 +01:00
MIPS: sni: Remove the read_persistent_clock()
2018-05-14 23:58:25 +01:00
Update MIPS email addresses
2017-11-03 09:02:30 -07:00
mips: txx9: fix iounmap related issue
2019-11-20 18:46:04 +01:00
MIPS: Disable Loongson MMI instructions for kernel build
2019-10-17 13:45:31 -07:00
MIPS: Annotate cpu_wait implementations with __cpuidle
2018-06-28 14:18:54 -07:00
MIPS: Disable Werror when W= is set
2017-04-10 11:56:07 +02:00
MIPS: Xilfpga: Switch to using generic defconfigs
2017-11-08 22:54:14 +00:00
MIPS: SiByte: Enable ZONE_DMA32 for LittleSur
2019-12-13 08:51:20 +01:00
Kconfig: consolidate the "Kernel hacking" menu
2018-08-02 08:06:48 +09:00
MIPS: have "plain" make calls build dtbs for selected platforms
2019-07-10 09:53:48 +02:00
License cleanup: add SPDX GPL-2.0 license identifier to files with no license
2017-11-02 11:10:55 +01:00
17d6ece980