kernel: Update to 3.6.6.

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

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 224fd52c260197ed41ca232fafcab05fc7543695..71624c598ae64dcc97034159a83667509bc33d60 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -1,63 +1,58 @@
 CONFIG_X86=y
 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
 CONFIG_ARCH_HAS_CPU_RELAX=y
 CONFIG_ARCH_HAS_DEFAULT_IDLE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_CPU_AUTOPROBE=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
 CONFIG_ARCH_CPU_PROBE_RELEASE=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
 
 #
 # General setup
 #
-# 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
 #
 CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
 
 #
 # RCU Subsystem
 #
 CONFIG_TREE_RCU=y
+CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RCU_FANOUT_EXACT is not set
 CONFIG_RCU_FAST_NO_HZ=y
+# CONFIG_CGROUP_HUGETLB is not set
 CONFIG_PCSPKR_PLATFORM=y
 
 #
 # Kernel Performance Events And Counters
 #
-CONFIG_JUMP_LABEL=y
+CONFIG_OPROFILE_NMI_TIMER=y
 CONFIG_USER_RETURN_NOTIFIER=y
 CONFIG_USE_GENERIC_SMP_HELPERS=y
 CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
-
-#
-# GCOV-based kernel profiling
-#
-CONFIG_STOP_MACHINE=y
+CONFIG_SECCOMP_FILTER=y
 
 #
 # IO Schedulers
@@ -69,7 +64,7 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 #
 # Processor type and features
 #
-CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_ZONE_DMA=y
 CONFIG_SMP=y
 CONFIG_X86_MPPARSE=y
 CONFIG_X86_EXTENDED_PLATFORM=y
@@ -81,7 +76,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
@@ -95,9 +89,8 @@ CONFIG_NO_BOOTMEM=y
 # CONFIG_MK8 is not set
 # CONFIG_MCORE2 is not set
 # CONFIG_MATOM is not set
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
 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,8 @@ 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_MEMORY_ISOLATION=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
 CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
@@ -143,7 +138,6 @@ CONFIG_MMU_NOTIFIER=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
 CONFIG_MEMORY_FAILURE=y
-# CONFIG_HWPOISON_INJECT is not set
 CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
 # CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
@@ -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
@@ -201,6 +196,7 @@ CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=y
 CONFIG_ACPI_CUSTOM_METHOD=m
+CONFIG_ACPI_BGRT=m
 CONFIG_ACPI_APEI=y
 CONFIG_ACPI_APEI_GHES=y
 CONFIG_ACPI_APEI_PCIEAER=y
@@ -259,6 +255,9 @@ CONFIG_PCIE_ECRC=y
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
+# CONFIG_PCIEASPM_DEFAULT is not set
+CONFIG_PCIEASPM_POWERSAVE=y
+# CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
 CONFIG_ARCH_SUPPORTS_MSI=y
 CONFIG_PCI_MSI=y
@@ -298,16 +297,27 @@ 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
 
+#
+# Altera FPGA firmware download module
+#
+# CONFIG_INTEL_MEI is not set
+
 #
 # SCSI Transports
 #
 CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_ADVANSYS=m
 CONFIG_SCSI_BUSLOGIC=m
 CONFIG_VMWARE_PVSCSI=m
 CONFIG_FCOE_FNIC=m
@@ -336,7 +346,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
@@ -368,7 +378,7 @@ CONFIG_MOUSE_PS2_LIFEBOOK=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_APANEL=m
 CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y
 
 #
 # Hardware I/O ports
@@ -392,7 +402,7 @@ CONFIG_SERIAL_8250_PNP=y
 #
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
-# CONFIG_VIRTIO_CONSOLE is not set
+CONFIG_HVC_XEN_FRONTEND=y
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m
@@ -416,7 +426,9 @@ CONFIG_I2C_SCMI=m
 #
 # Memory mapped GPIO drivers:
 #
+# CONFIG_GPIO_IT8761E is not set
 CONFIG_GPIO_SCH=m
+CONFIG_GPIO_ICH=m
 
 #
 # PCI GPIO expanders:
@@ -458,7 +470,7 @@ CONFIG_SBC_FITPC2_WATCHDOG=m
 CONFIG_IB700_WDT=m
 CONFIG_IBMASR=m
 # CONFIG_WAFER_WDT is not set
-CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
 CONFIG_ITCO_WDT=m
 # CONFIG_ITCO_VENDOR_SUPPORT is not set
 CONFIG_IT8712F_WDT=m
@@ -473,6 +485,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
@@ -488,7 +501,7 @@ CONFIG_XEN_WDT=m
 CONFIG_MFD_CS5535=m
 
 #
-# Multimedia drivers
+# Media drivers
 #
 CONFIG_IR_ENE=m
 CONFIG_IR_ITE_CIR=m
@@ -497,9 +510,8 @@ CONFIG_IR_NUVOTON=m
 CONFIG_IR_WINBOND_CIR=m
 
 #
-# Miscelaneous helper chips
+# Webcam and/or TV USB devices
 #
-CONFIG_VIDEO_MEYE=m
 CONFIG_VIDEO_VIA_CAMERA=m
 
 #
@@ -511,13 +523,24 @@ CONFIG_AGP_INTEL=y
 CONFIG_AGP_SIS=y
 CONFIG_AGP_VIA=y
 CONFIG_VGA_SWITCHEROO=y
-CONFIG_DRM_KMS_HELPER=m
 CONFIG_DRM_RADEON=m
 CONFIG_DRM_RADEON_KMS=y
+CONFIG_DRM_NOUVEAU=m
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_NOUVEAU_DEBUG=y
+
+#
+# I2C encoder or helper chips
+#
+# CONFIG_DRM_I2C_CH7006 is not set
+# CONFIG_DRM_I2C_SIL164 is not set
 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
@@ -594,6 +617,7 @@ CONFIG_EDAC=y
 #
 # Reporting subsystems
 #
+# CONFIG_EDAC_LEGACY_SYSFS is not set
 # CONFIG_EDAC_DEBUG is not set
 CONFIG_EDAC_DECODE_MCE=m
 CONFIG_EDAC_MCE_INJ=m
@@ -620,6 +644,12 @@ CONFIG_PCH_DMA=m
 # DMA Clients
 #
 CONFIG_DCA=m
+# CONFIG_VFIO is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+# CONFIG_HYPERV is not set
 
 #
 # Xen driver support
@@ -638,24 +668,16 @@ CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_SWIOTLB_XEN=y
 CONFIG_XEN_TMEM=y
 CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_ACPI_PROCESSOR=m
 # CONFIG_SLICOSS is not set
 # CONFIG_COMEDI is not set
-CONFIG_DRM_NOUVEAU=m
-CONFIG_DRM_NOUVEAU_BACKLIGHT=y
-CONFIG_DRM_NOUVEAU_DEBUG=y
-
-#
-# I2C encoder or helper chips
-#
-# CONFIG_DRM_I2C_CH7006 is not set
-# CONFIG_DRM_I2C_SIL164 is not set
+# CONFIG_ZRAM is not set
 # CONFIG_ACPI_QUICKSTART is not set
 
 #
-# Speakup console speech
+# Android
 #
-# CONFIG_DRM_PSB is not set
-# CONFIG_INTEL_MEI is not set
 CONFIG_X86_PLATFORM_DEVICES=y
 CONFIG_ACER_WMI=m
 CONFIG_ACERHDF=m
@@ -665,6 +687,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
@@ -688,7 +712,6 @@ CONFIG_ASUS_NB_WMI=m
 CONFIG_EEEPC_WMI=m
 CONFIG_ACPI_WMI=m
 CONFIG_MSI_WMI=m
-# CONFIG_ACPI_ASUS is not set
 CONFIG_TOPSTAR_LAPTOP=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_TOSHIBA_BT_RFKILL=m
@@ -700,6 +723,7 @@ CONFIG_SAMSUNG_LAPTOP=m
 CONFIG_MXM_WMI=m
 CONFIG_INTEL_OAKTRAIL=m
 CONFIG_SAMSUNG_Q10=m
+# CONFIG_APPLE_GMUX is not set
 
 #
 # Hardware Spinlock drivers
@@ -712,7 +736,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
@@ -727,9 +750,13 @@ 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
 
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+
 #
 # Pseudo filesystems
 #
@@ -743,11 +770,11 @@ CONFIG_HARDLOCKUP_DETECTOR=y
 # CONFIG_DEBUG_VIRTUAL is not set
 CONFIG_ARCH_WANT_FRAME_POINTERS=y
 CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_CPU_STALL_INFO is not set
 # CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set
 CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_FTRACE_NMI_ENTER=y
 CONFIG_FTRACE_SYSCALLS=y
+# CONFIG_UPROBE_EVENT is not set
 # CONFIG_MMIOTRACE is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
 CONFIG_EARLY_PRINTK=y
@@ -755,6 +782,7 @@ CONFIG_EARLY_PRINTK=y
 CONFIG_DEBUG_STACKOVERFLOW=y
 # CONFIG_X86_PTDUMP is not set
 CONFIG_DEBUG_NX_TEST=m
+# CONFIG_DEBUG_TLBFLUSH is not set
 # CONFIG_IOMMU_STRESS is not set
 CONFIG_IO_DELAY_TYPE_0X80=0
 CONFIG_IO_DELAY_TYPE_0XED=1
@@ -769,16 +797,17 @@ CONFIG_DEBUG_BOOT_PARAMS=y
 # CONFIG_CPA_DEBUG is not set
 CONFIG_OPTIMIZE_INLINING=y
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
-
-#
-# Memory Protections
-#
-# CONFIG_GRKERNSEC_IO is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
 
 #
 # Non-executable pages
 #
+CONFIG_PAX_NOEXEC=y
+CONFIG_PAX_PAGEEXEC=y
 CONFIG_PAX_EMUTRAMP=y
+CONFIG_PAX_MPROTECT=y
+# CONFIG_PAX_MPROTECT_COMPAT is not set
+CONFIG_PAX_ELFRELOCS=y
 
 #
 # Address Space Layout Randomization
@@ -790,6 +819,27 @@ CONFIG_PAX_RANDKSTACK=y
 #
 CONFIG_PAX_MEMORY_STACKLEAK=y
 CONFIG_PAX_REFCOUNT=y
+# CONFIG_PAX_SIZE_OVERFLOW is not set
+
+#
+# Memory Protections
+#
+# CONFIG_GRKERNSEC_IO is not set
+
+#
+# Kernel Auditing
+#
+CONFIG_GRKERNSEC_RWXMAP_LOG=y
+CONFIG_GRKERNSEC_AUDIT_TEXTREL=y
+
+#
+# Executable Protections
+#
+CONFIG_GRKERNSEC_SETXID=y
+
+#
+# Logging Options
+#
 CONFIG_LSM_MMAP_MIN_ADDR=65536
 CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
 CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
@@ -798,6 +848,8 @@ CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
 # Crypto core or helper
 #
 CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_ABLK_HELPER_X86=y
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
 
 #
 # Digest
@@ -829,5 +881,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