Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2018-08-24 12:35:54 +0200
committerJohannes Thumshirn <jthumshirn@suse.de>2018-08-24 12:35:54 +0200
commit304299805d1f5ab814c593bc770f89e105ab19a7 (patch)
tree538391302ae47231321ba1f5ff92248371e84965
parent302a4390aa1ecb4021567ecfb7f77ab5c17a26c0 (diff)
parentad4eb26d5c1288c5d51be601f10e09088fcf157b (diff)
Merge remote-tracking branch 'origin/users/mbrugger/SLE12-SP4/for-next' into SLE12-SP4
Pull arm64 fix from Matthias Brugger. suse-commit: e9cdc42ee3450f58c443c72ec5345ae6f370892e
-rw-r--r--arch/arm64/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index ff03618e95dd..a6250e771c11 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -832,6 +832,7 @@ config FORCE_MAX_ZONEORDER
int
default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE)
default "12" if (ARM64_16K_PAGES && TRANSPARENT_HUGEPAGE)
+ default "13" if (ARM64_4K_PAGES && ARCH_THUNDER)
default "11"
help
The kernel memory allocator divides physically contiguous memory