main/linux-grsec: tune config

Tune config to better match linux-vanilla config

1 files changed, 15 insertions, 24 deletions

diff --git a/main/linux-grsec/kernelconfig.x86 b/main/linux-grsec/kernelconfig.x86
index db0a92a955..74463fb610 100644
--- a/main/linux-grsec/kernelconfig.x86
+++ b/main/linux-grsec/kernelconfig.x86
@@ -523,7 +523,7 @@ CONFIG_ACPI_CONTAINER=y
 CONFIG_ACPI_SBS=m
 CONFIG_ACPI_HED=m
 # CONFIG_ACPI_CUSTOM_METHOD is not set
-# CONFIG_ACPI_BGRT is not set
+CONFIG_ACPI_BGRT=y
 CONFIG_ACPI_APEI=y
 # CONFIG_ACPI_APEI_GHES is not set
 CONFIG_ACPI_APEI_EINJ=m
@@ -555,7 +555,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_X86_INTEL_PSTATE=y
 CONFIG_X86_PCC_CPUFREQ=m
 CONFIG_X86_ACPI_CPUFREQ=m
-# CONFIG_X86_ACPI_CPUFREQ_CPB is not set
+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
@@ -2127,10 +2127,10 @@ CONFIG_ATL2=m
 CONFIG_ATL1=m
 CONFIG_ATL1E=m
 CONFIG_ATL1C=m
-CONFIG_ALX=m
+# CONFIG_ALX is not set
 CONFIG_NET_CADENCE=y
-# CONFIG_ARM_AT91_ETHER is not set
-# CONFIG_MACB is not set
+CONFIG_ARM_AT91_ETHER=m
+CONFIG_MACB=m
 CONFIG_NET_VENDOR_BROADCOM=y
 CONFIG_B44=m
 CONFIG_B44_PCI_AUTOSELECT=y
@@ -2318,7 +2318,7 @@ CONFIG_PHYLIB=m
 #
 # MII PHY device drivers
 #
-# CONFIG_AT803X_PHY is not set
+CONFIG_AT803X_PHY=m
 CONFIG_AMD_PHY=m
 CONFIG_MARVELL_PHY=m
 CONFIG_DAVICOM_PHY=m
@@ -3143,7 +3143,7 @@ CONFIG_PPS_CLIENT_LDISC=m
 # PTP clock support
 #
 CONFIG_PTP_1588_CLOCK=m
-# CONFIG_DP83640_PHY is not set
+CONFIG_DP83640_PHY=m
 CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_GPIOLIB=y
@@ -3552,14 +3552,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
@@ -3594,7 +3592,7 @@ CONFIG_IR_REDRAT3=m
 CONFIG_IR_STREAMZAP=m
 CONFIG_IR_WINBOND_CIR=m
 CONFIG_IR_IGUANA=m
-# CONFIG_IR_TTUSBIR is not set
+CONFIG_IR_TTUSBIR=m
 CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_MEDIA_USB_SUPPORT=y
@@ -3666,9 +3664,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
@@ -3810,7 +3806,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
@@ -3819,10 +3815,7 @@ CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
 # Supported MMC/SDIO adapters
 #
 # CONFIG_SMS_SDIO_DRV is not set
-CONFIG_MEDIA_PARPORT_SUPPORT=y
-# CONFIG_VIDEO_BWQCAM is not set
-# CONFIG_VIDEO_CQCAM is not set
-# CONFIG_VIDEO_PMS is not set
+# CONFIG_MEDIA_PARPORT_SUPPORT is not set
 
 #
 # Supported FireWire (IEEE 1394) Adapters
@@ -4856,7 +4849,7 @@ CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
 CONFIG_LEDS_LP5562=m
 # CONFIG_LEDS_LP8501 is not set
-# CONFIG_LEDS_CLEVO_MAIL is not set
+CONFIG_LEDS_CLEVO_MAIL=m
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
 # CONFIG_LEDS_PCA9685 is not set
@@ -5207,8 +5200,7 @@ CONFIG_INTEL_IOMMU_FLOPPY_WA=y
 #
 # Remoteproc drivers
 #
-CONFIG_REMOTEPROC=m
-CONFIG_STE_MODEM_RPROC=m
+# CONFIG_STE_MODEM_RPROC is not set
 
 #
 # Rpmsg drivers
@@ -5445,7 +5437,7 @@ CONFIG_PSTORE=y
 CONFIG_PSTORE_RAM=m
 CONFIG_SYSV_FS=m
 CONFIG_UFS_FS=m
-CONFIG_UFS_FS_WRITE=y
+# CONFIG_UFS_FS_WRITE is not set
 # CONFIG_UFS_DEBUG is not set
 CONFIG_EXOFS_FS=m
 # CONFIG_EXOFS_DEBUG is not set
@@ -5495,7 +5487,7 @@ CONFIG_CIFS_ACL=y
 CONFIG_CIFS_DEBUG=y
 # CONFIG_CIFS_DEBUG2 is not set
 CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_SMB2 is not set
+CONFIG_CIFS_SMB2=y
 # CONFIG_CIFS_FSCACHE is not set
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
@@ -5800,7 +5792,6 @@ CONFIG_GRKERNSEC_KMEM=y
 CONFIG_GRKERNSEC_PERF_HARDEN=y
 # CONFIG_GRKERNSEC_RAND_THREADSTACK is not set
 CONFIG_GRKERNSEC_PROC_MEMMAP=y
-CONFIG_GRKERNSEC_KSTACKOVERFLOW=y
 CONFIG_GRKERNSEC_BRUTE=y
 # CONFIG_GRKERNSEC_MODHARDEN is not set
 # CONFIG_GRKERNSEC_HIDESYM is not set