config: Make the PREEMPT be really turned off.

Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff --git a/linux.config b/linux.config
index 750e50fdd364dee48c3c77be859f39d835b5d681..e062767dc8d087316b0161f09b5d2d52354d9bcd 100644 (file)
--- a/linux.config
+++ b/linux.config
@@ -393,9 +393,9 @@ CONFIG_IXGBEVF=y
 # Refer to the file README.mlppp, provided by PC300 package.
 #
 CONFIG_NETCONSOLE=m
+CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_NETPOLL=y
 # CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
 # CONFIG_IEEE802154 is not set
 #
 # ISDN subsystem
@@ -758,7 +758,7 @@ CONFIG_XEN_GNTDEV=y
 CONFIG_XEN_GRANT_DEV_ALLOC=y
 CONFIG_XEN_BACKEND=y
 CONFIG_XEN_NETDEV_BACKEND=y
-CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION="upstream"
 CONFIG_XEN_BLKDEV_BACKEND=y
 CONFIG_XEN_PCIDEV_BACKEND=y
 CONFIG_XEN_SCSI_BACKEND=m
@@ -806,6 +806,8 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 
+# CONFIG_PREEMPT is not set
+# CONFIG_PREEMPT_VOLUNTARY is not set
 CONFIG_PREEMPT_NONE=y
 
 CONFIG_IRQ_TIME_ACCOUNTING=y
@@ -846,3 +848,5 @@ CONFIG_CGROUP=y
 
 # CONFIG_EVENT_TRACING is not set
 # CONFIG_NET_DSA is not set
+#
+CONFIG_INTEL_TXT=y