summaryrefslogtreecommitdiffstats
path: root/baseconfig
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2017-02-10 16:19:58 -0600
committerJustin M. Forbes <jforbes@redhat.com>2017-02-10 16:19:58 -0600
commit43f3e35901393e7c5d75cc5a6ac51e94b1516c8b (patch)
treeeef1dac3bb174207ee73453bf187f9bcbaa4b1ee /baseconfig
parentd316ff48475ab84a1dd5c346501d06214ad3a6c2 (diff)
downloadkernel-43f3e35901393e7c5d75cc5a6ac51e94b1516c8b.tar.gz
kernel-43f3e35901393e7c5d75cc5a6ac51e94b1516c8b.tar.xz
kernel-43f3e35901393e7c5d75cc5a6ac51e94b1516c8b.zip
Linux v4.10-rc7-127-g3d88460
Diffstat (limited to 'baseconfig')
-rw-r--r--baseconfig/s390x/CONFIG_EMU_SIZE1
-rw-r--r--baseconfig/s390x/CONFIG_NODES_SHIFT1
-rw-r--r--baseconfig/s390x/CONFIG_NUMA2
-rw-r--r--baseconfig/s390x/CONFIG_NUMA_BALANCING1
-rw-r--r--baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED1
-rw-r--r--baseconfig/s390x/CONFIG_NUMA_EMU1
6 files changed, 6 insertions, 1 deletions
diff --git a/baseconfig/s390x/CONFIG_EMU_SIZE b/baseconfig/s390x/CONFIG_EMU_SIZE
new file mode 100644
index 000000000..116273f0c
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_EMU_SIZE
@@ -0,0 +1 @@
+CONFIG_EMU_SIZE=0x10000000
diff --git a/baseconfig/s390x/CONFIG_NODES_SHIFT b/baseconfig/s390x/CONFIG_NODES_SHIFT
new file mode 100644
index 000000000..747517623
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_NODES_SHIFT
@@ -0,0 +1 @@
+CONFIG_NODES_SHIFT=4
diff --git a/baseconfig/s390x/CONFIG_NUMA b/baseconfig/s390x/CONFIG_NUMA
index 7482c9800..e480f0c04 100644
--- a/baseconfig/s390x/CONFIG_NUMA
+++ b/baseconfig/s390x/CONFIG_NUMA
@@ -1 +1 @@
-# CONFIG_NUMA is not set
+CONFIG_NUMA=y
diff --git a/baseconfig/s390x/CONFIG_NUMA_BALANCING b/baseconfig/s390x/CONFIG_NUMA_BALANCING
new file mode 100644
index 000000000..9de89d51d
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_NUMA_BALANCING
@@ -0,0 +1 @@
+CONFIG_NUMA_BALANCING=y
diff --git a/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED b/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
new file mode 100644
index 000000000..5f7402180
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_NUMA_BALANCING_DEFAULT_ENABLED
@@ -0,0 +1 @@
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
diff --git a/baseconfig/s390x/CONFIG_NUMA_EMU b/baseconfig/s390x/CONFIG_NUMA_EMU
new file mode 100644
index 000000000..a444d47bb
--- /dev/null
+++ b/baseconfig/s390x/CONFIG_NUMA_EMU
@@ -0,0 +1 @@
+CONFIG_NUMA_EMU=y