[tor-commits] [tor-ramdisk/master] Tweak kernel config for amd64 and x86

[blueness at torproject.org]

commit bda547c38eac9923763d2921b22ac995ef87eb92
Author: Anthony G. Basile <blueness at gentoo.org>
Date:   Tue Feb 25 08:39:53 2014 -0500

    Tweak kernel config for amd64 and x86
    
    For added entropy:
     PAX_LATENT_ENTROPY
    
    Additional supported nics:
     NET_VENDOR_ARC
     ALX
     I40E
     SH_ETH
     SMSC911X
---
 configs/kernel-3.13.3.x86.config    |   17 +++++++++--------
 configs/kernel-3.13.3.x86_64.config |   17 +++++++++--------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/configs/kernel-3.13.3.x86.config b/configs/kernel-3.13.3.x86.config
index 3717ed7..3621fd6 100644
--- a/configs/kernel-3.13.3.x86.config
+++ b/configs/kernel-3.13.3.x86.config
@@ -447,7 +447,7 @@ CONFIG_BINFMT_ELF=y
 CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_SCRIPT=y
-CONFIG_HAVE_AOUT=y
+# CONFIG_HAVE_AOUT is not set
 # CONFIG_BINFMT_MISC is not set
 CONFIG_COREDUMP=y
 CONFIG_HAVE_ATOMIC_IOMAP=y
@@ -690,13 +690,13 @@ CONFIG_ACENIC=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=y
 CONFIG_PCNET32=y
-# CONFIG_NET_VENDOR_ARC is not set
+CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=y
 CONFIG_ATL1=y
 CONFIG_ATL1E=y
 CONFIG_ATL1C=y
-# CONFIG_ALX is not set
+CONFIG_ALX=y
 CONFIG_NET_CADENCE=y
 CONFIG_ARM_AT91_ETHER=y
 CONFIG_MACB=y
@@ -755,7 +755,7 @@ CONFIG_IGBVF=y
 CONFIG_IXGB=y
 CONFIG_IXGBE=y
 CONFIG_IXGBE_HWMON=y
-# CONFIG_I40E is not set
+CONFIG_I40E=y
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_IP1000=y
 CONFIG_JME=y
@@ -801,7 +801,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=y
-# CONFIG_SH_ETH is not set
+CONFIG_SH_ETH=y
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=y
 CONFIG_NET_VENDOR_SEEQ=y
@@ -814,7 +814,8 @@ CONFIG_SFC=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_EPIC100=y
-# CONFIG_SMSC911X is not set
+CONFIG_SMSC911X=y
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SMSC9420=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=y
@@ -865,7 +866,7 @@ CONFIG_SMSC_PHY=y
 # CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_MICREL_PHY is not set
 # CONFIG_FIXED_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=y
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
 # CONFIG_WLAN is not set
@@ -1783,7 +1784,7 @@ CONFIG_PAX_CONSTIFY_PLUGIN=y
 CONFIG_PAX_USERCOPY=y
 # CONFIG_PAX_USERCOPY_DEBUG is not set
 # CONFIG_PAX_SIZE_OVERFLOW is not set
-# CONFIG_PAX_LATENT_ENTROPY is not set
+CONFIG_PAX_LATENT_ENTROPY=y
 
 #
 # Memory Protections
diff --git a/configs/kernel-3.13.3.x86_64.config b/configs/kernel-3.13.3.x86_64.config
index e8bccd2..597cfe5 100644
--- a/configs/kernel-3.13.3.x86_64.config
+++ b/configs/kernel-3.13.3.x86_64.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.13.3 Kernel Configuration
+# Linux/x86 3.13.3 Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
@@ -668,13 +668,13 @@ CONFIG_ACENIC=y
 CONFIG_NET_VENDOR_AMD=y
 CONFIG_AMD8111_ETH=y
 CONFIG_PCNET32=y
-# CONFIG_NET_VENDOR_ARC is not set
+CONFIG_NET_VENDOR_ARC=y
 CONFIG_NET_VENDOR_ATHEROS=y
 CONFIG_ATL2=y
 CONFIG_ATL1=y
 CONFIG_ATL1E=y
 CONFIG_ATL1C=y
-# CONFIG_ALX is not set
+CONFIG_ALX=y
 CONFIG_NET_CADENCE=y
 CONFIG_ARM_AT91_ETHER=y
 CONFIG_MACB=y
@@ -733,7 +733,7 @@ CONFIG_IGBVF=y
 CONFIG_IXGB=y
 CONFIG_IXGBE=y
 CONFIG_IXGBE_HWMON=y
-# CONFIG_I40E is not set
+CONFIG_I40E=y
 CONFIG_NET_VENDOR_I825XX=y
 CONFIG_IP1000=y
 CONFIG_JME=y
@@ -779,7 +779,7 @@ CONFIG_8139TOO_TUNE_TWISTER=y
 CONFIG_8139TOO_8129=y
 # CONFIG_8139_OLD_RX_RESET is not set
 CONFIG_R8169=y
-# CONFIG_SH_ETH is not set
+CONFIG_SH_ETH=y
 CONFIG_NET_VENDOR_RDC=y
 CONFIG_R6040=y
 CONFIG_NET_VENDOR_SEEQ=y
@@ -792,7 +792,8 @@ CONFIG_SFC=y
 CONFIG_SFC_MCDI_MON=y
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_EPIC100=y
-# CONFIG_SMSC911X is not set
+CONFIG_SMSC911X=y
+# CONFIG_SMSC911X_ARCH_HOOKS is not set
 CONFIG_SMSC9420=y
 CONFIG_NET_VENDOR_STMICRO=y
 CONFIG_STMMAC_ETH=y
@@ -843,7 +844,7 @@ CONFIG_SMSC_PHY=y
 # CONFIG_LSI_ET1011C_PHY is not set
 # CONFIG_MICREL_PHY is not set
 # CONFIG_FIXED_PHY is not set
-# CONFIG_MDIO_BITBANG is not set
+CONFIG_MDIO_BITBANG=y
 # CONFIG_PPP is not set
 # CONFIG_SLIP is not set
 # CONFIG_WLAN is not set
@@ -1760,7 +1761,7 @@ CONFIG_PAX_CONSTIFY_PLUGIN=y
 CONFIG_PAX_USERCOPY=y
 # CONFIG_PAX_USERCOPY_DEBUG is not set
 # CONFIG_PAX_SIZE_OVERFLOW is not set
-# CONFIG_PAX_LATENT_ENTROPY is not set
+CONFIG_PAX_LATENT_ENTROPY=y
 
 #
 # Memory Protections