Home Home > GIT Browse > stable
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2019-05-22 13:11:40 +0200
committerJiri Slaby <jslaby@suse.cz>2019-05-22 13:11:40 +0200
commit0739fa4bcf7a21941c7e28c52b33b0f531044868 (patch)
tree92f5f84652114fd9478eea7dbf9ec574ecf2bd5c
parent4be0add391a1220612df3befabb0c6adc0c77a9c (diff)
Update config files.stable
-rw-r--r--config/s390x/default1
-rw-r--r--config/s390x/zfcpdump1
2 files changed, 2 insertions, 0 deletions
diff --git a/config/s390x/default b/config/s390x/default
index 7c952b86c0..cfc629f71b 100644
--- a/config/s390x/default
+++ b/config/s390x/default
@@ -615,6 +615,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_HAVE_MEMBLOCK_PHYS_MAP=y
+CONFIG_HAVE_GENERIC_GUP=y
CONFIG_MEMORY_ISOLATION=y
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
CONFIG_MEMORY_HOTPLUG=y
diff --git a/config/s390x/zfcpdump b/config/s390x/zfcpdump
index 3e3b73d020..e583f9c6bc 100644
--- a/config/s390x/zfcpdump
+++ b/config/s390x/zfcpdump
@@ -504,6 +504,7 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
CONFIG_HAVE_MEMBLOCK_PHYS_MAP=y
+CONFIG_HAVE_GENERIC_GUP=y
CONFIG_MEMORY_ISOLATION=y
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set
# CONFIG_MEMORY_HOTPLUG is not set