X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=kernel%2Fconfig-generic;h=195a8d0e142915f19714a353b65a1c0b6165b693;hb=fc32b25fbe5b1c77f5804d43b9e01ee7a42d3e6e;hp=1e974e186caedbb05b6fd0697d3a1d413d0b10ed;hpb=d80cb086ccd489efa1eea5c5a149039855dcf0c8;p=ipfire-3.x.git

diff --git a/kernel/config-generic b/kernel/config-generic
index 1e974e186..195a8d0e1 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -68,6 +68,7 @@ CONFIG_PREEMPT_NONE=y
 CONFIG_VIRT_CPU_ACCOUNTING=y
 CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
 # CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_HAVE_SCHED_AVG_IRQ=y
 CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_TASKSTATS=y
@@ -210,6 +211,7 @@ CONFIG_SMP=y
 CONFIG_PARAVIRT=y
 CONFIG_XEN=y
 CONFIG_XEN_DOM0=y
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
 
@@ -217,8 +219,11 @@ CONFIG_SCHED_MC=y
 # Performance monitoring
 #
 CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
 # CONFIG_HZ_250 is not set
+CONFIG_HZ_300=y
 # CONFIG_HZ_1000 is not set
+CONFIG_HZ=300
 CONFIG_SCHED_HRTICK=y
 CONFIG_HOTPLUG_CPU=y
 
@@ -281,6 +286,8 @@ CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
@@ -633,7 +640,7 @@ CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
+# CONFIG_IPV6_SIT_6RD is not set
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_GRE=m