UBUNTU: [Config] s390x -- switch preempt mode to none

BugLink: http://bugs.launchpad.net/bugs/1543165Signed-off-by: Andy Whitcroft <apw@canonical.com>

debian.master/config/amd64/config.common.amd64

@@ -302,6 +302,7 @@ CONFIG_PPP=y
 CONFIG_PPS=m
 CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PPS_CLIENT_LDISC=m
+# CONFIG_PREEMPT_NONE is not set
 CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y
 # CONFIG_PSTORE_CONSOLE is not set

debian.master/config/annotations

@@ -9647,8 +9647,8 @@ CONFIG_PPC_4K_PAGES                             policy<{'powerpc': 'y', 'ppc64el
 CONFIG_PPC_64K_PAGES                            policy<{'powerpc-powerpc64-smp': 'n', 'ppc64el': 'y'}>
 
 # Menu: Processor type and features >> Preemption Model
-CONFIG_PREEMPT_NONE                             policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
-CONFIG_PREEMPT_VOLUNTARY                        policy<{'amd64-generic': 'y', 'amd64-lowlatency': 'n', 'arm64': 'y', 'armhf': 'y', 'i386-generic': 'y', 'i386-lowlatency': 'n', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'y'}>
+CONFIG_PREEMPT_NONE                             policy<{'amd64': 'n', 'arm64': 'n', 'armhf': 'n', 'i386': 'n', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'y'}>
+CONFIG_PREEMPT_VOLUNTARY                        policy<{'amd64-generic': 'y', 'amd64-lowlatency': 'n', 'arm64': 'y', 'armhf': 'y', 'i386-generic': 'y', 'i386-lowlatency': 'n', 'powerpc': 'y', 'ppc64el': 'y', 's390x': 'n'}>
 CONFIG_PREEMPT                                  policy<{'amd64-generic': 'n', 'amd64-lowlatency': 'y', 'arm64': 'n', 'armhf': 'n', 'i386-generic': 'n', 'i386-lowlatency': 'y', 'powerpc': 'n', 'ppc64el': 'n', 's390x': 'n'}>
 
 # Menu: Processor type and features >> Processor family

debian.master/config/arm64/config.common.arm64

@@ -301,6 +301,7 @@ CONFIG_PPS=m
 CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 # CONFIG_PROBE_EVENTS is not set
 CONFIG_PSTORE=y

debian.master/config/armhf/config.common.armhf

@@ -295,6 +295,7 @@ CONFIG_PPS=y
 CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y

debian.master/config/config.common.ubuntu

@@ -5960,7 +5960,6 @@ CONFIG_PPS_CLIENT_PARPORT=m
 CONFIG_PPTP=m
 # CONFIG_PQ2ADS is not set
 CONFIG_PREEMPT_COUNT=y
-# CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_NOTIFIERS=y
 CONFIG_PREEMPT_RCU=y
 # CONFIG_PREEMPT_TRACER is not set

debian.master/config/i386/config.common.i386

@@ -299,6 +299,7 @@ CONFIG_PPP=y
 CONFIG_PPS=m
 CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PPS_CLIENT_LDISC=m
+# CONFIG_PREEMPT_NONE is not set
 CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y
 # CONFIG_PSTORE_CONSOLE is not set

debian.master/config/powerpc/config.common.powerpc

@@ -296,6 +296,7 @@ CONFIG_PPS=m
 CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y

debian.master/config/ppc64el/config.common.ppc64el

@@ -342,6 +342,7 @@ CONFIG_PPS=y
 CONFIG_PPS_CLIENT_GPIO=m
 CONFIG_PPS_CLIENT_LDISC=m
 # CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_NONE is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PROBE_EVENTS=y
 CONFIG_PSTORE=y

debian.master/config/s390x/config.common.s390x

@@ -256,7 +256,8 @@ CONFIG_PPS=m
 # CONFIG_PPS_CLIENT_GPIO is not set
 # CONFIG_PPS_CLIENT_LDISC is not set
 # CONFIG_PREEMPT is not set
-CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_PREEMPT_NONE=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PROBE_EVENTS=y
 # CONFIG_PSTORE is not set
 CONFIG_PTP_1588_CLOCK=m