Enable THP on Power

11 files changed, 35 insertions, 7 deletions

diff --git a/baseconfig/powerpc/CONFIG_DEV_DAX b/baseconfig/powerpc/CONFIG_DEV_DAX
new file mode 100644
index 000000000..77478a213
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_DEV_DAX
@@ -0,0 +1 @@
+CONFIG_DEV_DAX=m
diff --git a/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM b/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM
new file mode 100644
index 000000000..8c7fd6732
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_DEV_DAX_PMEM
@@ -0,0 +1 @@
+CONFIG_DEV_DAX_PMEM=m
diff --git a/baseconfig/powerpc/CONFIG_NR_DEV_DAX b/baseconfig/powerpc/CONFIG_NR_DEV_DAX
new file mode 100644
index 000000000..3fd0f86b1
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_NR_DEV_DAX
@@ -0,0 +1 @@
+CONFIG_NR_DEV_DAX=32768
diff --git a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE
index 4874a851b..75d999c66 100644
--- a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE
+++ b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE
@@ -1 +1 @@
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE=y
diff --git a/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
new file mode 100644
index 000000000..f9a942f2c
--- /dev/null
+++ b/baseconfig/powerpc/CONFIG_TRANSPARENT_HUGEPAGE_MADVISE
@@ -0,0 +1 @@
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index d6b083fea..65553ea78 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -987,6 +987,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -3435,6 +3437,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -5039,7 +5042,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index c56fe1f1d..b760ea929 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -978,6 +978,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -3414,6 +3416,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -5016,7 +5019,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 2192e2e0c..b2eb1be09 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -942,6 +942,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -3380,6 +3382,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -4968,7 +4971,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index a9264e798..d2bb881c2 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -933,6 +933,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -3359,6 +3361,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -4945,7 +4948,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 4e438ab63..84fd40d09 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -942,6 +942,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 CONFIG_DETECT_HUNG_TASK=y
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -3379,6 +3381,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -4967,7 +4970,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index afc88f2ca..9c032c8b5 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -933,6 +933,8 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 # CONFIG_DEFXX is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 CONFIG_DEV_APPLETALK=m
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
 # CONFIG_DEVFREQ_GOV_PASSIVE is not set
 # CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
 # CONFIG_DEVFREQ_GOV_POWERSAVE is not set
@@ -3358,6 +3360,7 @@ CONFIG_NOUVEAU_DEBUG=5
 CONFIG_NOUVEAU_DEBUG_DEFAULT=3
 CONFIG_NOZOMI=m
 CONFIG_NR_CPUS=1024
+CONFIG_NR_DEV_DAX=32768
 CONFIG_NR_IRQS=512
 CONFIG_NS83820=m
 CONFIG_NSC_FIR=m
@@ -4944,7 +4947,8 @@ CONFIG_TOUCHSCREEN_ZFORCE=m
 CONFIG_TRACER_SNAPSHOT=y
 # CONFIG_TRACE_SINK is not set
 # CONFIG_TRACING_EVENTS_GPIO is not set
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 # CONFIG_TR is not set
 CONFIG_TRUSTED_KEYS=m
 # CONFIG_TS4800_IRQ is not set