From 9c63ef64062c9a3af1443894a01da024854061a7 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 13 Jul 2019 15:56:19 +0200
Subject: [PATCH 1/3] linux4.19: use 4k pages for ppc64*

---
 srcpkgs/linux4.19/files/ppc64-dotconfig   | 26 +++++++++++------------
 srcpkgs/linux4.19/files/ppc64le-dotconfig | 26 +++++++++++------------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/srcpkgs/linux4.19/files/ppc64-dotconfig b/srcpkgs/linux4.19/files/ppc64-dotconfig
index 5225900530f..cf936f563ef 100644
--- a/srcpkgs/linux4.19/files/ppc64-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.50 Kernel Configuration
+# Linux/powerpc 4.19.58 Kernel Configuration
 #
 
 #
-# Compiler: powerpc64-linux-gnu-gcc (GCC) 8.3.0
+# Compiler: gcc (GCC) 9.1.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80300
+CONFIG_GCC_VERSION=90100
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -250,10 +250,10 @@ CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_64BIT=y
 CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MAX=29
-CONFIG_ARCH_MMAP_RND_BITS_MIN=14
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=13
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NR_IRQS=512
@@ -304,7 +304,6 @@ CONFIG_SCOM_DEBUGFS=y
 CONFIG_PPC_POWERNV=y
 CONFIG_OPAL_PRD=m
 CONFIG_PPC_MEMTRACE=y
-CONFIG_PPC_VAS=y
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_DTL=y
@@ -476,11 +475,10 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ILLEGAL_POINTER_VALUE=0x5deadbeef0000000
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_PPC_4K_PAGES is not set
-CONFIG_PPC_64K_PAGES=y
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
 CONFIG_THREAD_SHIFT=14
-CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_PPC_SUBPAGE_PROT=y
+CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_PPC_COPRO_BASE=y
 CONFIG_SCHED_SMT=y
 CONFIG_PPC_DENORMALISATION=y
@@ -708,7 +706,7 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=28
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND=y
 CONFIG_COMPAT_OLD_SIGACTION=y
@@ -3311,6 +3309,7 @@ CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+# CONFIG_VMXNET3 is not set
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
@@ -8426,7 +8425,6 @@ CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_VMX=y
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
diff --git a/srcpkgs/linux4.19/files/ppc64le-dotconfig b/srcpkgs/linux4.19/files/ppc64le-dotconfig
index 35b32fca84b..778b9da2b95 100644
--- a/srcpkgs/linux4.19/files/ppc64le-dotconfig
+++ b/srcpkgs/linux4.19/files/ppc64le-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 4.19.50 Kernel Configuration
+# Linux/powerpc 4.19.58 Kernel Configuration
 #
 
 #
-# Compiler: powerpc64le-linux-gnu-gcc (GCC) 8.3.0
+# Compiler: gcc (GCC) 9.1.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80300
+CONFIG_GCC_VERSION=90100
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_IRQ_WORK=y
@@ -246,10 +246,10 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_PPC64_BOOT_WRAPPER=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MAX=29
-CONFIG_ARCH_MMAP_RND_BITS_MIN=14
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=13
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NR_IRQS=512
@@ -296,7 +296,6 @@ CONFIG_SCOM_DEBUGFS=y
 CONFIG_PPC_POWERNV=y
 CONFIG_OPAL_PRD=m
 CONFIG_PPC_MEMTRACE=y
-CONFIG_PPC_VAS=y
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_DTL=y
@@ -409,11 +408,10 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ILLEGAL_POINTER_VALUE=0x5deadbeef0000000
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_PPC_4K_PAGES is not set
-CONFIG_PPC_64K_PAGES=y
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
 CONFIG_THREAD_SHIFT=14
-CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_PPC_SUBPAGE_PROT=y
+CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_PPC_COPRO_BASE=y
 CONFIG_SCHED_SMT=y
 CONFIG_PPC_DENORMALISATION=y
@@ -624,7 +622,7 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=28
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_HAVE_RELIABLE_STACKTRACE=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND=y
@@ -3163,6 +3161,7 @@ CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+# CONFIG_VMXNET3 is not set
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
@@ -8183,7 +8182,6 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_VMX=y
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m

From 14f5a4bd37b4cf9f06aa523d24c4181fbdad743c Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 13 Jul 2019 04:43:56 +0200
Subject: [PATCH 2/3] linux5.1: use 4k pages for ppc64*

---
 srcpkgs/linux5.1/files/ppc64-dotconfig   | 32 +++++++++++-------------
 srcpkgs/linux5.1/files/ppc64le-dotconfig | 32 +++++++++++-------------
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/srcpkgs/linux5.1/files/ppc64-dotconfig b/srcpkgs/linux5.1/files/ppc64-dotconfig
index 7af37e6319b..215b36faeb8 100644
--- a/srcpkgs/linux5.1/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.1/files/ppc64-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.1.9 Kernel Configuration
+# Linux/powerpc 5.1.17 Kernel Configuration
 #
 
 #
-# Compiler: powerpc64-linux-gnu-gcc (GCC) 8.3.0
+# Compiler: gcc (GCC) 9.1.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80300
+CONFIG_GCC_VERSION=90100
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
@@ -251,10 +251,10 @@ CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_64BIT=y
 CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MAX=29
-CONFIG_ARCH_MMAP_RND_BITS_MIN=14
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=13
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NR_IRQS=512
@@ -303,7 +303,6 @@ CONFIG_SCOM_DEBUGFS=y
 CONFIG_PPC_POWERNV=y
 CONFIG_OPAL_PRD=m
 CONFIG_PPC_MEMTRACE=y
-CONFIG_PPC_VAS=y
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_DTL=y
@@ -476,14 +475,13 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ILLEGAL_POINTER_VALUE=0x5deadbeef0000000
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_PPC_4K_PAGES is not set
-CONFIG_PPC_64K_PAGES=y
-CONFIG_PPC_PAGE_SHIFT=16
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+CONFIG_PPC_PAGE_SHIFT=12
 CONFIG_THREAD_SHIFT=14
-CONFIG_ETEXT_SHIFT=16
-CONFIG_DATA_SHIFT=16
-CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_PPC_SUBPAGE_PROT=y
+CONFIG_ETEXT_SHIFT=12
+CONFIG_DATA_SHIFT=12
+CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_PPC_COPRO_BASE=y
 CONFIG_SCHED_SMT=y
 CONFIG_PPC_DENORMALISATION=y
@@ -613,7 +611,7 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=28
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_HAVE_ARCH_NVRAM_OPS=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND=y
@@ -3324,6 +3322,7 @@ CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+# CONFIG_VMXNET3 is not set
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
@@ -8513,7 +8512,6 @@ CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_VMX=y
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
diff --git a/srcpkgs/linux5.1/files/ppc64le-dotconfig b/srcpkgs/linux5.1/files/ppc64le-dotconfig
index 5d6303bfc59..7658ca252f6 100644
--- a/srcpkgs/linux5.1/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.1/files/ppc64le-dotconfig
@@ -1,13 +1,13 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/powerpc 5.1.9 Kernel Configuration
+# Linux/powerpc 5.1.17 Kernel Configuration
 #
 
 #
-# Compiler: powerpc64le-linux-gnu-gcc (GCC) 8.3.0
+# Compiler: gcc (GCC) 9.1.0
 #
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=80300
+CONFIG_GCC_VERSION=90100
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
 CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
@@ -247,10 +247,10 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_PPC64_BOOT_WRAPPER=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MAX=29
-CONFIG_ARCH_MMAP_RND_BITS_MIN=14
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=13
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NR_IRQS=512
@@ -295,7 +295,6 @@ CONFIG_SCOM_DEBUGFS=y
 CONFIG_PPC_POWERNV=y
 CONFIG_OPAL_PRD=m
 CONFIG_PPC_MEMTRACE=y
-CONFIG_PPC_VAS=y
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_DTL=y
@@ -409,14 +408,13 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ILLEGAL_POINTER_VALUE=0x5deadbeef0000000
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_PPC_4K_PAGES is not set
-CONFIG_PPC_64K_PAGES=y
-CONFIG_PPC_PAGE_SHIFT=16
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+CONFIG_PPC_PAGE_SHIFT=12
 CONFIG_THREAD_SHIFT=14
-CONFIG_ETEXT_SHIFT=16
-CONFIG_DATA_SHIFT=16
-CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_PPC_SUBPAGE_PROT=y
+CONFIG_ETEXT_SHIFT=12
+CONFIG_DATA_SHIFT=12
+CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_PPC_COPRO_BASE=y
 CONFIG_SCHED_SMT=y
 CONFIG_PPC_DENORMALISATION=y
@@ -547,7 +545,7 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=28
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_HAVE_RELIABLE_STACKTRACE=y
 CONFIG_HAVE_ARCH_NVRAM_OPS=y
 CONFIG_CLONE_BACKWARDS=y
@@ -3182,6 +3180,7 @@ CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+# CONFIG_VMXNET3 is not set
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
@@ -8276,7 +8275,6 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_VMX=y
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m

From ebc4fe87e0f85f35c85c429d7779986ade703ea4 Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 13 Jul 2019 16:00:25 +0200
Subject: [PATCH 3/3] linux5.2: use 4k pages for ppc64*

[ci skip]
---
 srcpkgs/linux5.2/files/ppc64-dotconfig   | 28 +++++++++++-------------
 srcpkgs/linux5.2/files/ppc64le-dotconfig | 28 +++++++++++-------------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/srcpkgs/linux5.2/files/ppc64-dotconfig b/srcpkgs/linux5.2/files/ppc64-dotconfig
index 42071fea3a8..97981613d6e 100644
--- a/srcpkgs/linux5.2/files/ppc64-dotconfig
+++ b/srcpkgs/linux5.2/files/ppc64-dotconfig
@@ -4,7 +4,7 @@
 #
 
 #
-# Compiler: powerpc64-linux-musl-gcc (GCC) 9.1.0
+# Compiler: gcc (GCC) 9.1.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=90100
@@ -271,10 +271,10 @@ CONFIG_CPU_BIG_ENDIAN=y
 # CONFIG_CPU_LITTLE_ENDIAN is not set
 CONFIG_64BIT=y
 CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MAX=29
-CONFIG_ARCH_MMAP_RND_BITS_MIN=14
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=13
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NR_IRQS=512
@@ -323,7 +323,6 @@ CONFIG_SCOM_DEBUGFS=y
 CONFIG_PPC_POWERNV=y
 CONFIG_OPAL_PRD=m
 CONFIG_PPC_MEMTRACE=y
-CONFIG_PPC_VAS=y
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_DTL=y
@@ -508,14 +507,13 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ILLEGAL_POINTER_VALUE=0x5deadbeef0000000
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_PPC_4K_PAGES is not set
-CONFIG_PPC_64K_PAGES=y
-CONFIG_PPC_PAGE_SHIFT=16
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+CONFIG_PPC_PAGE_SHIFT=12
 CONFIG_THREAD_SHIFT=14
-CONFIG_ETEXT_SHIFT=16
-CONFIG_DATA_SHIFT=16
-CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_PPC_SUBPAGE_PROT=y
+CONFIG_ETEXT_SHIFT=12
+CONFIG_DATA_SHIFT=12
+CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_PPC_COPRO_BASE=y
 CONFIG_SCHED_SMT=y
 CONFIG_PPC_DENORMALISATION=y
@@ -652,7 +650,7 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=28
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_HAVE_ARCH_NVRAM_OPS=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND=y
@@ -3471,6 +3469,7 @@ CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+# CONFIG_VMXNET3 is not set
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
@@ -8895,7 +8894,6 @@ CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_ENCRYPT=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_VMX=y
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
diff --git a/srcpkgs/linux5.2/files/ppc64le-dotconfig b/srcpkgs/linux5.2/files/ppc64le-dotconfig
index b30b822a095..db144ff51af 100644
--- a/srcpkgs/linux5.2/files/ppc64le-dotconfig
+++ b/srcpkgs/linux5.2/files/ppc64le-dotconfig
@@ -4,7 +4,7 @@
 #
 
 #
-# Compiler: powerpc64le-linux-musl-gcc (GCC) 9.1.0
+# Compiler: gcc (GCC) 9.1.0
 #
 CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=90100
@@ -267,10 +267,10 @@ CONFIG_CPU_LITTLE_ENDIAN=y
 CONFIG_PPC64_BOOT_WRAPPER=y
 CONFIG_64BIT=y
 CONFIG_MMU=y
-CONFIG_ARCH_MMAP_RND_BITS_MAX=29
-CONFIG_ARCH_MMAP_RND_BITS_MIN=14
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=13
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=17
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_HAVE_SETUP_PER_CPU_AREA=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NR_IRQS=512
@@ -315,7 +315,6 @@ CONFIG_SCOM_DEBUGFS=y
 CONFIG_PPC_POWERNV=y
 CONFIG_OPAL_PRD=m
 CONFIG_PPC_MEMTRACE=y
-CONFIG_PPC_VAS=y
 CONFIG_PPC_PSERIES=y
 CONFIG_PPC_SPLPAR=y
 CONFIG_DTL=y
@@ -435,14 +434,13 @@ CONFIG_SYS_SUPPORTS_HUGETLBFS=y
 CONFIG_ILLEGAL_POINTER_VALUE=0x5deadbeef0000000
 CONFIG_ARCH_MEMORY_PROBE=y
 CONFIG_NODES_SPAN_OTHER_NODES=y
-# CONFIG_PPC_4K_PAGES is not set
-CONFIG_PPC_64K_PAGES=y
-CONFIG_PPC_PAGE_SHIFT=16
+CONFIG_PPC_4K_PAGES=y
+# CONFIG_PPC_64K_PAGES is not set
+CONFIG_PPC_PAGE_SHIFT=12
 CONFIG_THREAD_SHIFT=14
-CONFIG_ETEXT_SHIFT=16
-CONFIG_DATA_SHIFT=16
-CONFIG_FORCE_MAX_ZONEORDER=9
-CONFIG_PPC_SUBPAGE_PROT=y
+CONFIG_ETEXT_SHIFT=12
+CONFIG_DATA_SHIFT=12
+CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_PPC_COPRO_BASE=y
 CONFIG_SCHED_SMT=y
 CONFIG_PPC_DENORMALISATION=y
@@ -580,7 +578,7 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_ARCH_MMAP_RND_BITS=28
 CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=11
 CONFIG_HAVE_RELIABLE_STACKTRACE=y
 CONFIG_HAVE_ARCH_NVRAM_OPS=y
 CONFIG_CLONE_BACKWARDS=y
@@ -3321,6 +3319,7 @@ CONFIG_IEEE802154_ATUSB=m
 CONFIG_IEEE802154_ADF7242=m
 # CONFIG_IEEE802154_MCR20A is not set
 CONFIG_IEEE802154_HWSIM=m
+# CONFIG_VMXNET3 is not set
 # CONFIG_NETDEVSIM is not set
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
@@ -8649,7 +8648,6 @@ CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_NX=y
 CONFIG_CRYPTO_DEV_NX_COMPRESS=m
 CONFIG_CRYPTO_DEV_NX_COMPRESS_PSERIES=m
-CONFIG_CRYPTO_DEV_NX_COMPRESS_POWERNV=m
 # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set
 CONFIG_CRYPTO_DEV_VMX=y
 CONFIG_CRYPTO_DEV_VMX_ENCRYPT=m
