diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-30 07:41:06 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2017-03-30 07:41:06 +0200 |
| commit | 023b4bd4ac8dcfeb4e24c4644de6fb316e9e4b2b (patch) | |
| tree | ff186ab58faba05cc911fa03bfaec328e2dd48ff /kernel-ppc64-debug.config | |
| parent | a6dcfee2bf285fdc55960ebfba0b29407a9e2601 (diff) | |
| parent | 2439f8931750cb2d248803aea0a6802afc29df49 (diff) | |
| download | kernel-023b4bd4ac8dcfeb4e24c4644de6fb316e9e4b2b.tar.gz kernel-023b4bd4ac8dcfeb4e24c4644de6fb316e9e4b2b.tar.xz kernel-023b4bd4ac8dcfeb4e24c4644de6fb316e9e4b2b.zip | |
Merge remote-tracking branch 'origin/master'kernel-4.11.0-0.rc4.git2.1.vanilla.knurd.1.fc27kernel-4.11.0-0.rc4.git2.1.vanilla.knurd.1.fc26kernel-4.11.0-0.rc4.git2.1.vanilla.knurd.1.fc25kernel-4.11.0-0.rc4.git2.1.vanilla.knurd.1.fc24
Diffstat (limited to 'kernel-ppc64-debug.config')
| -rw-r--r-- | kernel-ppc64-debug.config | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config index 9d7ecaab3..3ba077273 100644 --- a/kernel-ppc64-debug.config +++ b/kernel-ppc64-debug.config @@ -993,6 +993,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 @@ -3461,6 +3463,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 @@ -5086,7 +5089,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 |