main/linux-vanilla: syncronize config with grsec kernel

1 files changed, 51 insertions, 78 deletions

diff --git a/main/linux-vanilla/kernelconfig.x86 b/main/linux-vanilla/kernelconfig.x86
index 3731e4cab..6f86bbe03 100644
--- a/main/linux-vanilla/kernelconfig.x86
+++ b/main/linux-vanilla/kernelconfig.x86
@@ -239,6 +239,7 @@ CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
 CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
 CONFIG_HAVE_CC_STACKPROTECTOR=y
 CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_CC_STACKPROTECTOR_NONE is not set
@@ -564,7 +565,7 @@ CONFIG_X86_ACPI_CPUFREQ_CPB=y
 # CONFIG_X86_POWERNOW_K6 is not set
 # CONFIG_X86_POWERNOW_K7 is not set
 CONFIG_X86_POWERNOW_K8=m
-# CONFIG_X86_AMD_FREQ_SENSITIVITY is not set
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
 # CONFIG_X86_GX_SUSPMOD is not set
 CONFIG_X86_SPEEDSTEP_CENTRINO=m
 CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y
@@ -683,7 +684,7 @@ CONFIG_NET=y
 # Networking options
 #
 CONFIG_PACKET=m
-# CONFIG_PACKET_DIAG is not set
+CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 CONFIG_XFRM=y
@@ -691,7 +692,7 @@ CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_MIGRATE=y
-# CONFIG_XFRM_STATISTICS is not set
+CONFIG_XFRM_STATISTICS=y
 CONFIG_XFRM_IPCOMP=m
 CONFIG_NET_KEY=m
 CONFIG_NET_KEY_MIGRATE=y
@@ -1658,8 +1659,8 @@ CONFIG_SENSORS_LIS3_I2C=m
 # Altera FPGA firmware download module
 #
 CONFIG_ALTERA_STAPL=m
-# CONFIG_INTEL_MEI is not set
-# CONFIG_INTEL_MEI_ME is not set
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
 CONFIG_VMWARE_VMCI=m
 
 #
@@ -1933,7 +1934,9 @@ CONFIG_MD_RAID10=m
 CONFIG_MD_RAID456=m
 CONFIG_MD_MULTIPATH=m
 CONFIG_MD_FAULTY=m
-# CONFIG_BCACHE is not set
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
 CONFIG_BLK_DEV_DM_BUILTIN=y
 CONFIG_BLK_DEV_DM=m
 # CONFIG_DM_DEBUG is not set
@@ -2004,7 +2007,7 @@ CONFIG_IFB=m
 CONFIG_NET_TEAM=m
 CONFIG_NET_TEAM_MODE_BROADCAST=m
 CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
-# CONFIG_NET_TEAM_MODE_RANDOM is not set
+CONFIG_NET_TEAM_MODE_RANDOM=m
 CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
 CONFIG_NET_TEAM_MODE_LOADBALANCE=m
 CONFIG_MACVLAN=m
@@ -2067,7 +2070,7 @@ CONFIG_ATM_SOLOS=m
 # CAIF transport drivers
 #
 CONFIG_VHOST_NET=m
-# CONFIG_VHOST_SCSI is not set
+CONFIG_VHOST_SCSI=m
 CONFIG_VHOST_RING=m
 CONFIG_VHOST=m
 
@@ -2332,7 +2335,7 @@ CONFIG_USB_CATC=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PEGASUS=m
 CONFIG_USB_RTL8150=m
-# CONFIG_USB_RTL8152 is not set
+CONFIG_USB_RTL8152=m
 CONFIG_USB_USBNET=m
 CONFIG_USB_NET_AX8817X=m
 CONFIG_USB_NET_AX88179_178A=m
@@ -2527,7 +2530,7 @@ CONFIG_RT2800USB_RT33XX=y
 # CONFIG_RT2800USB_RT35XX is not set
 CONFIG_RT2800USB_RT3573=y
 CONFIG_RT2800USB_RT53XX=y
-# CONFIG_RT2800USB_RT55XX is not set
+CONFIG_RT2800USB_RT55XX=y
 CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
 CONFIG_RT2800_LIB_MMIO=m
@@ -2544,7 +2547,7 @@ CONFIG_RTL8192CE=m
 CONFIG_RTL8192SE=m
 CONFIG_RTL8192DE=m
 CONFIG_RTL8723AE=m
-# CONFIG_RTL8188EE is not set
+CONFIG_RTL8188EE=m
 CONFIG_RTL8192CU=m
 CONFIG_RTLWIFI=m
 CONFIG_RTLWIFI_PCI=m
@@ -2604,7 +2607,7 @@ CONFIG_IEEE802154_DRIVERS=m
 CONFIG_IEEE802154_FAKEHARD=m
 CONFIG_IEEE802154_FAKELB=m
 CONFIG_IEEE802154_AT86RF230=m
-CONFIG_IEEE802154_MRF24J40=m
+# CONFIG_IEEE802154_MRF24J40 is not set
 CONFIG_VMXNET3=m
 CONFIG_HYPERV_NET=m
 CONFIG_ISDN=y
@@ -2898,7 +2901,7 @@ CONFIG_SERIAL_UARTLITE=m
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
 CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_SCCNXP=m
+# CONFIG_SERIAL_SCCNXP is not set
 CONFIG_SERIAL_TIMBERDALE=m
 CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m
@@ -2949,13 +2952,12 @@ CONFIG_MWAVE=m
 CONFIG_RAW_DRIVER=m
 CONFIG_MAX_RAW_DEVS=256
 CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-# CONFIG_HPET_MMAP_DEFAULT is not set
+# CONFIG_HPET_MMAP is not set
 CONFIG_HANGCHECK_TIMER=m
 CONFIG_TCG_TPM=m
 CONFIG_TCG_TIS=m
 # CONFIG_TCG_TIS_I2C_ATMEL is not set
-CONFIG_TCG_TIS_I2C_INFINEON=m
+# CONFIG_TCG_TIS_I2C_INFINEON is not set
 # CONFIG_TCG_TIS_I2C_NUVOTON is not set
 CONFIG_TCG_NSC=m
 CONFIG_TCG_ATMEL=m
@@ -3059,7 +3061,7 @@ CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_PXA2XX_DMA=y
 CONFIG_SPI_PXA2XX=m
 CONFIG_SPI_PXA2XX_PCI=m
-CONFIG_SPI_SC18IS602=m
+# CONFIG_SPI_SC18IS602 is not set
 CONFIG_SPI_TOPCLIFF_PCH=m
 CONFIG_SPI_XCOMM=m
 # CONFIG_SPI_XILINX is not set
@@ -3204,7 +3206,7 @@ CONFIG_SENSORS_ADM1029=m
 CONFIG_SENSORS_ADM1031=m
 CONFIG_SENSORS_ADM9240=m
 CONFIG_SENSORS_ADT7X10=m
-# CONFIG_SENSORS_ADT7310 is not set
+CONFIG_SENSORS_ADT7310=m
 CONFIG_SENSORS_ADT7410=m
 CONFIG_SENSORS_ADT7411=m
 CONFIG_SENSORS_ADT7462=m
@@ -3253,7 +3255,7 @@ CONFIG_SENSORS_LTC4151=m
 CONFIG_SENSORS_LTC4215=m
 CONFIG_SENSORS_LTC4245=m
 CONFIG_SENSORS_LTC4261=m
-# CONFIG_SENSORS_LM95234 is not set
+CONFIG_SENSORS_LM95234=m
 CONFIG_SENSORS_LM95241=m
 CONFIG_SENSORS_LM95245=m
 CONFIG_SENSORS_MAX1111=m
@@ -3266,7 +3268,7 @@ CONFIG_SENSORS_MAX6642=m
 CONFIG_SENSORS_MAX6650=m
 CONFIG_SENSORS_MAX6697=m
 CONFIG_SENSORS_MCP3021=m
-# CONFIG_SENSORS_NCT6775 is not set
+CONFIG_SENSORS_NCT6775=m
 CONFIG_SENSORS_NTC_THERMISTOR=m
 CONFIG_SENSORS_PC87360=m
 CONFIG_SENSORS_PC87427=m
@@ -3488,7 +3490,7 @@ CONFIG_MEDIA_SUPPORT=m
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
-CONFIG_MEDIA_RADIO_SUPPORT=y
+# CONFIG_MEDIA_RADIO_SUPPORT is not set
 CONFIG_MEDIA_RC_SUPPORT=y
 CONFIG_MEDIA_CONTROLLER=y
 CONFIG_VIDEO_DEV=m
@@ -3497,14 +3499,12 @@ CONFIG_VIDEO_V4L2=m
 # CONFIG_VIDEO_ADV_DEBUG is not set
 # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
 CONFIG_VIDEO_TUNER=m
-CONFIG_V4L2_MEM2MEM_DEV=m
 CONFIG_VIDEOBUF_GEN=m
 CONFIG_VIDEOBUF_DMA_SG=m
 CONFIG_VIDEOBUF_VMALLOC=m
 CONFIG_VIDEOBUF_DVB=m
 CONFIG_VIDEOBUF2_CORE=m
 CONFIG_VIDEOBUF2_MEMOPS=m
-CONFIG_VIDEOBUF2_DMA_CONTIG=m
 CONFIG_VIDEOBUF2_VMALLOC=m
 CONFIG_DVB_CORE=m
 CONFIG_DVB_NET=y
@@ -3611,9 +3611,7 @@ CONFIG_VIDEO_USBTV=m
 # CONFIG_VIDEO_HDPVR is not set
 # CONFIG_VIDEO_TLG2300 is not set
 # CONFIG_VIDEO_USBVISION is not set
-CONFIG_VIDEO_STK1160_COMMON=m
-CONFIG_VIDEO_STK1160_AC97=y
-CONFIG_VIDEO_STK1160=m
+# CONFIG_VIDEO_STK1160_COMMON is not set
 
 #
 # Analog/digital TV USB devices
@@ -3746,7 +3744,7 @@ CONFIG_DVB_NGENE=m
 CONFIG_DVB_DDBRIDGE=m
 # CONFIG_V4L_PLATFORM_DRIVERS is not set
 CONFIG_V4L_MEM2MEM_DRIVERS=y
-CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+# CONFIG_VIDEO_MEM2MEM_DEINTERLACE is not set
 # CONFIG_VIDEO_SH_VEU is not set
 # CONFIG_VIDEO_RENESAS_VSP1 is not set
 # CONFIG_V4L_TEST_DRIVERS is not set
@@ -3756,33 +3754,6 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 #
 # CONFIG_SMS_SDIO_DRV is not set
 # CONFIG_MEDIA_PARPORT_SUPPORT is not set
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_TEA575X=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_RADIO_SI4713=m
-# CONFIG_USB_SI4713 is not set
-# CONFIG_PLATFORM_SI4713 is not set
-CONFIG_I2C_SI4713=m
-CONFIG_USB_MR800=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_SHARK=m
-CONFIG_RADIO_SHARK2=m
-CONFIG_USB_KEENE=m
-# CONFIG_USB_RAREMONO is not set
-CONFIG_USB_MA901=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_RADIO_SAA7706H=m
-CONFIG_RADIO_TEF6862=m
-CONFIG_RADIO_TIMBERDALE=m
-CONFIG_RADIO_WL1273=m
-
-#
-# Texas Instruments WL128x FM driver (ST based)
-#
-CONFIG_RADIO_WL128X=m
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -3864,8 +3835,6 @@ CONFIG_MEDIA_TUNER_TDA8290=m
 CONFIG_MEDIA_TUNER_TDA827X=m
 CONFIG_MEDIA_TUNER_TDA18271=m
 CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
 CONFIG_MEDIA_TUNER_MT20XX=m
 CONFIG_MEDIA_TUNER_MT2060=m
 CONFIG_MEDIA_TUNER_MT2063=m
@@ -4212,7 +4181,7 @@ CONFIG_BACKLIGHT_ADP8860=m
 # CONFIG_BACKLIGHT_ADP8870 is not set
 CONFIG_BACKLIGHT_PCF50633=m
 # CONFIG_BACKLIGHT_LM3630A is not set
-CONFIG_BACKLIGHT_LM3639=m
+# CONFIG_BACKLIGHT_LM3639 is not set
 # CONFIG_BACKLIGHT_LP855X is not set
 # CONFIG_BACKLIGHT_OT200 is not set
 # CONFIG_BACKLIGHT_GPIO is not set
@@ -4326,9 +4295,7 @@ CONFIG_SND_ENS1371=m
 CONFIG_SND_ES1938=m
 CONFIG_SND_ES1968=m
 CONFIG_SND_ES1968_INPUT=y
-CONFIG_SND_ES1968_RADIO=y
 CONFIG_SND_FM801=m
-# CONFIG_SND_FM801_TEA575X_BOOL is not set
 CONFIG_SND_HDA_INTEL=m
 CONFIG_SND_HDA_DSP_LOADER=y
 CONFIG_SND_HDA_PREALLOC_SIZE=4096
@@ -4443,9 +4410,14 @@ CONFIG_HID_ICADE=m
 # CONFIG_HID_KENSINGTON is not set
 CONFIG_HID_LCPOWER=m
 CONFIG_HID_LENOVO_TPKBD=m
-# CONFIG_HID_LOGITECH is not set
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
 CONFIG_HID_MAGICMOUSE=m
-# CONFIG_HID_MICROSOFT is not set
+CONFIG_HID_MICROSOFT=m
 # CONFIG_HID_MONTEREY is not set
 CONFIG_HID_MULTITOUCH=m
 # CONFIG_HID_NTRIG is not set
@@ -4457,7 +4429,7 @@ CONFIG_HID_PICOLCD_FB=y
 CONFIG_HID_PICOLCD_BACKLIGHT=y
 CONFIG_HID_PICOLCD_LCD=y
 CONFIG_HID_PICOLCD_LEDS=y
-# CONFIG_HID_PICOLCD_CIR is not set
+CONFIG_HID_PICOLCD_CIR=y
 CONFIG_HID_PRIMAX=m
 CONFIG_HID_ROCCAT=m
 # CONFIG_HID_SAITEK is not set
@@ -4475,11 +4447,11 @@ CONFIG_HID_HYPERV_MOUSE=m
 CONFIG_HID_THINGM=m
 # CONFIG_HID_THRUSTMASTER is not set
 # CONFIG_HID_WACOM is not set
-# CONFIG_HID_WIIMOTE is not set
+CONFIG_HID_WIIMOTE=m
 # CONFIG_HID_XINMO is not set
 # CONFIG_HID_ZEROPLUS is not set
 CONFIG_HID_ZYDACRON=m
-# CONFIG_HID_SENSOR_HUB is not set
+CONFIG_HID_SENSOR_HUB=m
 
 #
 # USB HID support
@@ -4646,7 +4618,7 @@ CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_OPTICON=m
 CONFIG_USB_SERIAL_XSENS_MT=m
 # CONFIG_USB_SERIAL_WISHBONE is not set
-CONFIG_USB_SERIAL_ZTE=m
+# CONFIG_USB_SERIAL_ZTE is not set
 # CONFIG_USB_SERIAL_SSU100 is not set
 CONFIG_USB_SERIAL_QT2=m
 CONFIG_USB_SERIAL_DEBUG=m
@@ -4753,26 +4725,26 @@ CONFIG_LEDS_CLASS=y
 #
 CONFIG_LEDS_LM3530=m
 # CONFIG_LEDS_LM3642 is not set
-CONFIG_LEDS_PCA9532=m
-# CONFIG_LEDS_PCA9532_GPIO is not set
-CONFIG_LEDS_GPIO=m
+# CONFIG_LEDS_PCA9532 is not set
+# CONFIG_LEDS_GPIO is not set
 CONFIG_LEDS_LP3944=m
-# CONFIG_LEDS_LP5521 is not set
-# CONFIG_LEDS_LP5523 is not set
-# CONFIG_LEDS_LP5562 is not set
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
 # CONFIG_LEDS_LP8501 is not set
 CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
+# CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_PCA9685 is not set
-CONFIG_LEDS_DAC124S085=m
+# CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_PWM is not set
-CONFIG_LEDS_BD2802=m
+# CONFIG_LEDS_BD2802 is not set
 CONFIG_LEDS_INTEL_SS4200=m
 CONFIG_LEDS_LT3593=m
 CONFIG_LEDS_DELL_NETBOOKS=m
 # CONFIG_LEDS_TCA6507 is not set
-CONFIG_LEDS_LM355x=m
+# CONFIG_LEDS_LM355x is not set
 # CONFIG_LEDS_OT200 is not set
 CONFIG_LEDS_BLINKM=m
 
@@ -4792,7 +4764,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
 # iptables trigger is under Netfilter config (LED target)
 #
 CONFIG_LEDS_TRIGGER_TRANSIENT=m
-# CONFIG_LEDS_TRIGGER_CAMERA is not set
+CONFIG_LEDS_TRIGGER_CAMERA=m
 CONFIG_ACCESSIBILITY=y
 # CONFIG_A11Y_BRAILLE_CONSOLE is not set
 CONFIG_INFINIBAND=m
@@ -5089,7 +5061,7 @@ CONFIG_INTEL_OAKTRAIL=m
 # CONFIG_APPLE_GMUX is not set
 # CONFIG_INTEL_RST is not set
 # CONFIG_INTEL_SMARTCONNECT is not set
-# CONFIG_PVPANIC is not set
+CONFIG_PVPANIC=m
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CHROMEOS_LAPTOP=m
 CONFIG_CHROMEOS_PSTORE=m
@@ -5392,7 +5364,8 @@ CONFIG_CIFS=m
 CONFIG_CIFS_XATTR=y
 CONFIG_CIFS_POSIX=y
 CONFIG_CIFS_ACL=y
-# CONFIG_CIFS_DEBUG is not set
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
 CONFIG_CIFS_DFS_UPCALL=y
 CONFIG_CIFS_SMB2=y
 # CONFIG_CIFS_FSCACHE is not set