From d1a9aa7aeaf071e22b34e3beffe36623dec27dcf Mon Sep 17 00:00:00 2001
From: Julio Montes <julio.montes@intel.com>
Date: Wed, 6 Mar 2019 15:22:33 -0600
Subject: [PATCH] kernel: pmem device should map pages

enable ZONE_DEVICE config to support map pages, pmem_should_map_pages()
function fails if this config is not enabled.

fixes #378

Signed-off-by: Julio Montes <julio.montes@intel.com
---
 kernel/configs/x86_64_kata_kvm_4.19.x | 13 ++++++++++++-
 kernel/kata_config_version            |  2 +-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/kernel/configs/x86_64_kata_kvm_4.19.x b/kernel/configs/x86_64_kata_kvm_4.19.x
index cd0eb69d20..6df02faea0 100644
--- a/kernel/configs/x86_64_kata_kvm_4.19.x
+++ b/kernel/configs/x86_64_kata_kvm_4.19.x
@@ -788,7 +788,12 @@ CONFIG_GENERIC_EARLY_IOREMAP=y
 # CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
 # CONFIG_IDLE_PAGE_TRACKING is not set
 CONFIG_ARCH_HAS_ZONE_DEVICE=y
-# CONFIG_ZONE_DEVICE is not set
+CONFIG_ZONE_DEVICE=y
+CONFIG_ARCH_HAS_HMM=y
+CONFIG_DEV_PAGEMAP_OPS=y
+# CONFIG_HMM_MIRROR is not set
+# CONFIG_DEVICE_PRIVATE is not set
+# CONFIG_DEVICE_PUBLIC is not set
 # CONFIG_PERCPU_STATS is not set
 # CONFIG_GUP_BENCHMARK is not set
 CONFIG_ARCH_HAS_PTE_SPECIAL=y
@@ -2531,6 +2536,9 @@ CONFIG_ND_BLK=y
 CONFIG_ND_CLAIM=y
 CONFIG_ND_BTT=y
 CONFIG_BTT=y
+CONFIG_ND_PFN=y
+CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
 CONFIG_DAX_DRIVER=y
 CONFIG_DAX=y
 # CONFIG_NVMEM is not set
@@ -2961,6 +2969,7 @@ CONFIG_TEXTSEARCH_KMP=y
 CONFIG_TEXTSEARCH_BM=y
 CONFIG_TEXTSEARCH_FSM=y
 CONFIG_INTERVAL_TREE=y
+CONFIG_RADIX_TREE_MULTIORDER=y
 CONFIG_ASSOCIATIVE_ARRAY=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
@@ -3039,6 +3048,8 @@ CONFIG_HAVE_DEBUG_STACKOVERFLOW=y
 CONFIG_HAVE_ARCH_KASAN=y
 # CONFIG_KASAN is not set
 CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
 CONFIG_DEBUG_SHIRQ=y
 
 #
diff --git a/kernel/kata_config_version b/kernel/kata_config_version
index 9902f17848..f04c001f3f 100644
--- a/kernel/kata_config_version
+++ b/kernel/kata_config_version
@@ -1 +1 @@
-28
+29