diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-02 21:01:33 +0200 |
commit | 02ba673575de31650bcb39d7cfe0224bf1b7b449 (patch) | |
tree | 77ab559fd57445dc54d568b361dc54ef7b6ee3a8 /0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch | |
parent | 74ab72ba21a4bb026b91637fd91ef20edef750a0 (diff) | |
parent | fa1dee0747e32fcab94c1695e980d192cc8bac51 (diff) | |
download | kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.gz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.tar.xz kernel-02ba673575de31650bcb39d7cfe0224bf1b7b449.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200602gitf359287765c0.1.vanilla.1.fc33
Diffstat (limited to '0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch')
-rw-r--r-- | 0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch index 970824d59..353754d8b 100644 --- a/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch +++ b/0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch @@ -16,10 +16,10 @@ Signed-off-by: Jeremy Cline <jcline@redhat.com> 1 file changed, 1 insertion(+) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 7f37a6d0658a..c88ee0e8ce6e 100644 +index 94efc4629978..2e879c9d4c9d 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1126,6 +1126,7 @@ config XEN +@@ -1132,6 +1132,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE) |