From 0c649833232f595e80d66aac8b3e82735eff557e Mon Sep 17 00:00:00 2001
From: Justin Vreeland <jvreeland@twitter.com>
Date: Oct 21 2021 23:08:02 +0000
Subject: Fix page size to match redhat


---

diff --git a/SOURCES/kernel-aarch64-centos-sig-hyperscale.config b/SOURCES/kernel-aarch64-centos-sig-hyperscale.config
index 8e6be8c..a9ef90b 100644
--- a/SOURCES/kernel-aarch64-centos-sig-hyperscale.config
+++ b/SOURCES/kernel-aarch64-centos-sig-hyperscale.config
@@ -304,8 +304,8 @@ CONFIG_ARCH_XGENE=y
 CONFIG_ARCH_ZYNQMP=y
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_16K_PAGES is not set
-CONFIG_ARM64_4K_PAGES=y
-# CONFIG_ARM64_64K_PAGES is not set
+# CONFIG_ARM64_4K_PAGES is not set
+CONFIG_ARM64_64K_PAGES=y
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_ARM64_AMU_EXTN=y
 CONFIG_ARM64_BTI_KERNEL=y
@@ -356,6 +356,9 @@ CONFIG_ARM64_VA_BITS_48=y
 # CONFIG_ARM64_VA_BITS_52 is not set
 CONFIG_ARM64_VHE=y
 CONFIG_ARM64=y
+# CONFIG_ARM64_VA_BITS_42 is not set
+# CONFIG_ARM64_PA_BITS_52 is not set
+# CONFIG_ARM64_PA_BITS_53 is not set
 CONFIG_ARMADA_37XX_RWTM_MBOX=m
 CONFIG_ARMADA_37XX_WATCHDOG=m
 CONFIG_ARMADA_AP806_SYSCON=y
@@ -2143,7 +2146,7 @@ CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
 # CONFIG_FONTS is not set
 CONFIG_FORCEDETH=m
-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FORCE_MAX_ZONEORDER=14
 CONFIG_FORTIFY_SOURCE=y
 CONFIG_FPGA_BRIDGE=m
 CONFIG_FPGA_DFL_AFU=m
diff --git a/SOURCES/kernel-aarch64-debug-centos-sig-hyperscale.config b/SOURCES/kernel-aarch64-debug-centos-sig-hyperscale.config
index c46096a..a7633a2 100644
--- a/SOURCES/kernel-aarch64-debug-centos-sig-hyperscale.config
+++ b/SOURCES/kernel-aarch64-debug-centos-sig-hyperscale.config
@@ -304,8 +304,8 @@ CONFIG_ARCH_XGENE=y
 CONFIG_ARCH_ZYNQMP=y
 # CONFIG_ARCNET is not set
 # CONFIG_ARM64_16K_PAGES is not set
-CONFIG_ARM64_4K_PAGES=y
-# CONFIG_ARM64_64K_PAGES is not set
+# CONFIG_ARM64_4K_PAGES is not set
+CONFIG_ARM64_64K_PAGES=y
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 CONFIG_ARM64_AMU_EXTN=y
 CONFIG_ARM64_BTI_KERNEL=y
@@ -356,6 +356,9 @@ CONFIG_ARM64_VA_BITS_48=y
 # CONFIG_ARM64_VA_BITS_52 is not set
 CONFIG_ARM64_VHE=y
 CONFIG_ARM64=y
+# CONFIG_ARM64_VA_BITS_42 is not set
+# CONFIG_ARM64_PA_BITS_52 is not set
+# CONFIG_ARM64_PA_BITS_53 is not set
 CONFIG_ARMADA_37XX_RWTM_MBOX=m
 CONFIG_ARMADA_37XX_WATCHDOG=m
 CONFIG_ARMADA_AP806_SYSCON=y
@@ -2159,7 +2162,7 @@ CONFIG_FIXED_PHY=y
 CONFIG_FM10K=m
 # CONFIG_FONTS is not set
 CONFIG_FORCEDETH=m
-CONFIG_FORCE_MAX_ZONEORDER=11
+CONFIG_FORCE_MAX_ZONEORDER=14
 CONFIG_FORTIFY_SOURCE=y
 CONFIG_FPGA_BRIDGE=m
 CONFIG_FPGA_DFL_AFU=m
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 1e38196..9e7cd68 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -2978,6 +2978,9 @@ fi
 #
 #
 %changelog
+* Wed Oct 20 2021 Justin Vreeland <jvreeland@twitter.com> - 5.12.19-1
+- switch to 64K pages
+
 * Thu Sep 30 2021 Justin Vreeland <jvreeland@twitter.com> - 5.%{base_sublevel}.%{stable_update}-%{fedora_build}%{?buildid}%{?dist}
 - Linux v5.12.19
 - re sync with fedora configs