From 6988ea0bbaed136f93759bc0462e52b6ec1f7186 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Tue, 7 Feb 2012 11:16:03 -0500 Subject: [PATCH] config: Make the PREEMPT be really turned off. Signed-off-by: Konrad Rzeszutek Wilk --- linux.config | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/linux.config b/linux.config index 750e50f..e062767 100644 --- 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 -- 2.39.5