kernel: Update to 3.3.6.

[people/amarx/ipfire-3.x.git] / kernel / config-x86-generic

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index b9a309b400fc1f3edc5b11a5fb408fa388d2aaaf..b81d82e6e1093256f0e93d4b1c78ad137033d16b 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -3,10 +3,8 @@ CONFIG_INSTRUCTION_DECODER=y
 CONFIG_GENERIC_CMOS_UPDATE=y
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_ZONE_DMA=y
 CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 # CONFIG_RWSEM_GENERIC_SPINLOCK is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
@@ -16,7 +14,6 @@ CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
 CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
 CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_POPULATES_NODE_MAP=y
 CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 CONFIG_X86_HT=y
@@ -28,9 +25,6 @@ CONFIG_ARCH_CPU_PROBE_RELEASE=y
 # CONFIG_KERNEL_GZIP is not set
 # CONFIG_KERNEL_BZIP2 is not set
 CONFIG_KERNEL_XZ=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_WATCH=y
-CONFIG_AUDIT_TREE=y
 
 #
 # IRQ subsystem
@@ -49,6 +43,7 @@ CONFIG_PCSPKR_PLATFORM=y
 #
 # Kernel Performance Events And Counters
 #
+CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_JUMP_LABEL=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
@@ -69,6 +64,7 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 #
 # Processor type and features
 #
+CONFIG_ZONE_DMA=y
 CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
 CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
@@ -81,7 +77,6 @@ CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
 CONFIG_XEN_PRIVILEGED_GUEST=y
 CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=128
 CONFIG_XEN_SAVE_RESTORE=y
 CONFIG_XEN_DEBUG_FS=y
 CONFIG_KVM_CLOCK=y
@@ -96,8 +91,6 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
 CONFIG_X86_CMPXCHG=y
-CONFIG_CMPXCHG_LOCAL=y
-CONFIG_CMPXCHG_DOUBLE=y
 CONFIG_X86_L1_CACHE_SHIFT=6
 CONFIG_X86_XADD=y
 CONFIG_X86_WP_WORKS_OK=y
@@ -136,6 +129,7 @@ CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_DISCARD_MEMBLOCK=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
@@ -158,6 +152,7 @@ CONFIG_X86_PAT=y
 CONFIG_ARCH_USES_PG_UNCACHED=y
 CONFIG_ARCH_RANDOM=y
 CONFIG_EFI=y
+CONFIG_EFI_STUB=y
 # CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
 CONFIG_HZ_300=y
@@ -298,9 +293,14 @@ CONFIG_PNP=y
 #
 CONFIG_PNPACPI=y
 CONFIG_BLK_DEV_FD=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
 CONFIG_XEN_BLKDEV_FRONTEND=m
 CONFIG_XEN_BLKDEV_BACKEND=m
 # CONFIG_BLK_DEV_HD is not set
+
+#
+# Misc devices
+#
 CONFIG_SENSORS_LIS3LV02D=m
 CONFIG_VMWARE_BALLOON=m
 
@@ -308,6 +308,7 @@ CONFIG_VMWARE_BALLOON=m
 # SCSI Transports
 #
 CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_VMWARE_PVSCSI=m
 CONFIG_FCOE_FNIC=m
@@ -336,7 +337,7 @@ CONFIG_ATM_HE=m
 # CONFIG_ATM_HE_USE_SUNI is not set
 
 #
-# CAIF transport drivers
+# Distributed Switch Architecture drivers
 #
 CONFIG_IGB_DCA=y
 CONFIG_IXGBE_DCA=y
@@ -415,6 +416,7 @@ CONFIG_I2C_SCMI=m
 #
 # Memory mapped GPIO drivers:
 #
+# CONFIG_GPIO_IT8761E is not set
 CONFIG_GPIO_SCH=m
 
 #
@@ -472,6 +474,7 @@ CONFIG_NV_TCO=m
 # CONFIG_CPU5_WDT is not set
 CONFIG_SMSC_SCH311X_WDT=m
 # CONFIG_SMSC37B787_WDT is not set
+CONFIG_VIA_WDT=m
 CONFIG_W83627HF_WDT=m
 CONFIG_W83697HF_WDT=m
 CONFIG_W83697UG_WDT=m
@@ -517,6 +520,9 @@ CONFIG_DRM_I810=m
 CONFIG_DRM_I915=m
 CONFIG_DRM_I915_KMS=y
 CONFIG_DRM_SIS=m
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
 CONFIG_FB_BOOT_VESA_SUPPORT=y
 CONFIG_FB_CFB_FILLRECT=y
 CONFIG_FB_CFB_COPYAREA=y
@@ -620,6 +626,11 @@ CONFIG_PCH_DMA=m
 #
 CONFIG_DCA=m
 
+#
+# Microsoft Hyper-V guest support
+#
+# CONFIG_HYPERV is not set
+
 #
 # Xen driver support
 #
@@ -637,6 +648,7 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_SWIOTLB_XEN=y
 CONFIG_XEN_TMEM=y
 CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
 # CONFIG_SLICOSS is not set
 # CONFIG_COMEDI is not set
 CONFIG_DRM_NOUVEAU=m
@@ -653,8 +665,11 @@ CONFIG_DRM_NOUVEAU_DEBUG=y
 #
 # Speakup console speech
 #
-# CONFIG_DRM_PSB is not set
 # CONFIG_INTEL_MEI is not set
+
+#
+# Android
+#
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -664,6 +679,8 @@ CONFIG_DELL_WMI=m
 CONFIG_DELL_WMI_AIO=m
 CONFIG_FUJITSU_LAPTOP=m
 # CONFIG_FUJITSU_LAPTOP_DEBUG is not set
+# CONFIG_FUJITSU_TABLET is not set
+CONFIG_AMILO_RFKILL=m
 CONFIG_HP_ACCEL=m
 CONFIG_HP_WMI=m
 CONFIG_MSI_LAPTOP=m
@@ -711,7 +728,6 @@ CONFIG_DMAR_TABLE=y
 CONFIG_INTEL_IOMMU=y
 # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
 CONFIG_INTEL_IOMMU_FLOPPY_WA=y
-# CONFIG_HYPERV is not set
 
 #
 # Firmware Drivers
@@ -726,7 +742,6 @@ CONFIG_DMIID=y
 CONFIG_DMI_SYSFS=y
 CONFIG_ISCSI_IBFT_FIND=y
 CONFIG_ISCSI_IBFT=m
-# CONFIG_SIGMA is not set
 # CONFIG_GOOGLE_FIRMWARE is not set
 
 #
@@ -768,6 +783,7 @@ CONFIG_DEBUG_BOOT_PARAMS=y
 # CONFIG_CPA_DEBUG is not set
 CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
 
 #
 # Memory Protections
@@ -780,6 +796,11 @@ CONFIG_OPTIMIZE_INLINING=y
 CONFIG_GRKERNSEC_RWXMAP_LOG=y
 CONFIG_GRKERNSEC_AUDIT_TEXTREL=y
 
+#
+# Executable Protections
+#
+CONFIG_GRKERNSEC_SETXID=y
+
 #
 # Non-executable pages
 #
@@ -800,6 +821,7 @@ CONFIG_PAX_RANDKSTACK=y
 #
 CONFIG_PAX_MEMORY_STACKLEAK=y
 CONFIG_PAX_REFCOUNT=y
+# CONFIG_PAX_SIZE_OVERFLOW is not set
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
 CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
@@ -839,5 +861,6 @@ CONFIG_VHOST_NET=m
 # Library routines
 #
 CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_GENERIC_IOMAP=y
 CONFIG_GENERIC_ALLOCATOR=y
 CONFIG_CPU_RMAP=y