diff -urN oldtree/arch/i386/defconfig newtree/arch/i386/defconfig --- oldtree/arch/i386/defconfig 2006-09-26 18:45:59.000000000 -0400 +++ newtree/arch/i386/defconfig 2006-09-27 14:20:14.000000000 -0400 @@ -81,19 +81,6 @@ # CONFIG_LSF is not set # -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_DEFAULT_AS=y -# CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" - -# # Processor type and features # CONFIG_SMP=y @@ -194,10 +181,6 @@ # CONFIG_IRQBALANCE is not set CONFIG_REGPARM=y CONFIG_SECCOMP=y -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 # CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_PHYSICAL_START=0x100000 diff -urN oldtree/arch/ia64/configs/tiger_defconfig newtree/arch/ia64/configs/tiger_defconfig --- oldtree/arch/ia64/configs/tiger_defconfig 2006-09-24 17:03:56.000000000 -0400 +++ newtree/arch/ia64/configs/tiger_defconfig 2006-09-27 14:20:14.000000000 -0400 @@ -105,10 +105,10 @@ # CONFIG_IA64_PAGE_SIZE_64KB is not set CONFIG_PGTABLE_3=y # CONFIG_PGTABLE_4 is not set -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set # CONFIG_HZ_1000 is not set -CONFIG_HZ=250 +CONFIG_HZ=100 CONFIG_IA64_L1_CACHE_SHIFT=7 CONFIG_IA64_CYCLONE=y CONFIG_IOSAPIC=y diff -urN oldtree/arch/ia64/configs/zx1_defconfig newtree/arch/ia64/configs/zx1_defconfig --- oldtree/arch/ia64/configs/zx1_defconfig 2006-09-24 17:03:56.000000000 -0400 +++ newtree/arch/ia64/configs/zx1_defconfig 2006-09-27 14:20:14.000000000 -0400 @@ -103,10 +103,10 @@ # CONFIG_IA64_PAGE_SIZE_64KB is not set CONFIG_PGTABLE_3=y # CONFIG_PGTABLE_4 is not set -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set # CONFIG_HZ_1000 is not set -CONFIG_HZ=250 +CONFIG_HZ=100 CONFIG_IA64_L1_CACHE_SHIFT=7 # CONFIG_IA64_CYCLONE is not set CONFIG_IOSAPIC=y diff -urN oldtree/arch/ia64/defconfig newtree/arch/ia64/defconfig --- oldtree/arch/ia64/defconfig 2006-09-24 17:03:56.000000000 -0400 +++ newtree/arch/ia64/defconfig 2006-09-27 14:20:14.000000000 -0400 @@ -65,19 +65,6 @@ # # -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -CONFIG_DEFAULT_AS=y -# CONFIG_DEFAULT_DEADLINE is not set -# CONFIG_DEFAULT_CFQ is not set -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="anticipatory" - -# # Processor type and features # CONFIG_IA64=y @@ -105,10 +92,6 @@ # CONFIG_IA64_PAGE_SIZE_64KB is not set CONFIG_PGTABLE_3=y # CONFIG_PGTABLE_4 is not set -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 CONFIG_IA64_L1_CACHE_SHIFT=7 CONFIG_IA64_CYCLONE=y CONFIG_IOSAPIC=y @@ -119,7 +102,6 @@ CONFIG_IA64_NR_NODES=256 CONFIG_HOTPLUG_CPU=y # CONFIG_SCHED_SMT is not set -# CONFIG_PREEMPT is not set CONFIG_SELECT_MEMORY_MODEL=y # CONFIG_FLATMEM_MANUAL is not set CONFIG_DISCONTIGMEM_MANUAL=y diff -urN oldtree/arch/x86_64/defconfig newtree/arch/x86_64/defconfig --- oldtree/arch/x86_64/defconfig 2006-09-26 18:39:54.000000000 -0400 +++ newtree/arch/x86_64/defconfig 2006-09-27 14:20:14.000000000 -0400 @@ -85,19 +85,6 @@ # CONFIG_LSF is not set # -# IO Schedulers -# -CONFIG_IOSCHED_NOOP=y -# CONFIG_IOSCHED_AS is not set -CONFIG_IOSCHED_DEADLINE=y -CONFIG_IOSCHED_CFQ=y -# CONFIG_DEFAULT_AS is not set -# CONFIG_DEFAULT_DEADLINE is not set -CONFIG_DEFAULT_CFQ=y -# CONFIG_DEFAULT_NOOP is not set -CONFIG_DEFAULT_IOSCHED="cfq" - -# # Processor type and features # CONFIG_X86_PC=y @@ -121,10 +108,6 @@ CONFIG_SMP=y CONFIG_SCHED_SMT=y CONFIG_SCHED_MC=y -# CONFIG_PREEMPT_NONE is not set -CONFIG_PREEMPT_VOLUNTARY=y -# CONFIG_PREEMPT is not set -CONFIG_PREEMPT_BKL=y CONFIG_NUMA=y CONFIG_K8_NUMA=y CONFIG_NODES_SHIFT=6 @@ -162,10 +145,6 @@ CONFIG_PHYSICAL_START=0x200000 CONFIG_SECCOMP=y # CONFIG_CC_STACKPROTECTOR is not set -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y -# CONFIG_HZ_1000 is not set -CONFIG_HZ=250 # CONFIG_REORDER is not set CONFIG_K8_NB=y CONFIG_GENERIC_HARDIRQS=y diff -urN oldtree/block/Kconfig.iosched newtree/block/Kconfig.iosched --- oldtree/block/Kconfig.iosched 2006-09-24 17:03:56.000000000 -0400 +++ newtree/block/Kconfig.iosched 2006-09-27 14:20:14.000000000 -0400 @@ -41,7 +41,7 @@ choice prompt "Default I/O scheduler" - default DEFAULT_CFQ + default DEFAULT_DEADLINE help Select the I/O scheduler which will be used by default for all block devices. diff -urN oldtree/kernel/Kconfig.hz newtree/kernel/Kconfig.hz --- oldtree/kernel/Kconfig.hz 2006-09-27 14:07:46.000000000 -0400 +++ newtree/kernel/Kconfig.hz 2006-09-27 14:20:14.000000000 -0400 @@ -4,7 +4,7 @@ choice prompt "Timer frequency" - default HZ_250 + default HZ_1000 help Allows the configuration of the timer frequency. It is customary to have the timer interrupt run at 1000 HZ but 100 HZ may be more @@ -21,14 +21,17 @@ help 100 HZ is a typical choice for servers, SMP and NUMA systems with lots of processors that may show reduced performance if - too many timer interrupts are occurring. + too many timer interrupts are occurring. Laptops may also show + improved battery life. - config HZ_250 + config HZ_250_NODEFAULT bool "250 HZ" help - 250 HZ is a good compromise choice allowing server performance - while also showing good interactive responsiveness even - on SMP and NUMA systems. + 250 HZ is a lousy compromise choice allowing server interactivity + while also showing desktop throughput and no extra power saving on + laptops. Good for when you can't make up your mind. + + Recommend 100 or 1000 instead. config HZ_864 bool "864 HZ" @@ -49,7 +52,7 @@ config HZ int default 100 if HZ_100 - default 250 if HZ_250 + default 250 if HZ_250_NODEFAULT default 864 if HZ_864 default 1000 if HZ_1000 diff -urN oldtree/kernel/Kconfig.preempt newtree/kernel/Kconfig.preempt --- oldtree/kernel/Kconfig.preempt 2006-09-26 19:09:35.000000000 -0400 +++ newtree/kernel/Kconfig.preempt 2006-09-27 14:20:14.000000000 -0400 @@ -1,4 +1,3 @@ - choice prompt "Preemption Model" default PREEMPT_NONE