diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 20:10:00 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 20:10:00 +0200 |
commit | f4c3c7a8ab9226af448d66103dfddf387711af9d (patch) | |
tree | fe668c86a171420067eefe2b30ab4ca764ebd4c8 /0001-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch | |
parent | d2c10672fc73b0484b5bd441c7a43087a20cfc61 (diff) | |
parent | 4459220aecb835a73131f0de65f5d9b4200a8efc (diff) | |
download | kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.tar.gz kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.tar.xz kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc31
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 831aa32b9..f67328da1 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 2ed6a27d00b3..86d9a30061eb 100644 +index 2fba78e84d53..47f5f3c8c7aa 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1132,6 +1132,7 @@ config XEN +@@ -1133,6 +1133,7 @@ config XEN config FORCE_MAX_ZONEORDER int default "14" if (ARM64_64K_PAGES && TRANSPARENT_HUGEPAGE) |