diff -urpN -X /home/fletch/.diff.exclude 100-early_printk/arch/i386/Kconfig 101-config_hz/arch/i386/Kconfig --- 100-early_printk/arch/i386/Kconfig Sun Apr 20 21:09:39 2003 +++ 101-config_hz/arch/i386/Kconfig Sun Apr 20 21:09:39 2003 @@ -758,6 +758,25 @@ config MTRR See for more information. +choice + help + This is unrelated to your processor's speed. This variable alters + how often the system is asked to generate timer interrupts. A larger + value can lead to a more responsive system, but also causes extra + overhead from the increased number of context switches. + + If in doubt, leave it at the default of 1000. + + prompt "Kernel HZ" + default 1000HZ + +config 100HZ + bool "100 Hz" + +config 1000HZ + bool "1000 Hz" +endchoice + config HAVE_DEC_LOCK bool depends on (SMP || PREEMPT) && X86_CMPXCHG diff -urpN -X /home/fletch/.diff.exclude 100-early_printk/include/asm-i386/param.h 101-config_hz/include/asm-i386/param.h --- 100-early_printk/include/asm-i386/param.h Sun Nov 17 20:29:26 2002 +++ 101-config_hz/include/asm-i386/param.h Sun Apr 20 21:09:39 2003 @@ -2,10 +2,18 @@ #define _ASMi386_PARAM_H #ifdef __KERNEL__ -# define HZ 1000 /* Internal kernel timer frequency */ -# define USER_HZ 100 /* .. some user interfaces are in "ticks" */ -# define CLOCKS_PER_SEC (USER_HZ) /* like times() */ +#include + +#ifdef CONFIG_1000HZ +# define HZ 1000 /* Internal kernel timer frequency */ +#else +# define HZ 100 #endif + +#define USER_HZ 100 /* .. some user interfaces are in "ticks" */ +#define CLOCKS_PER_SEC (USER_HZ) /* like times() */ + +#endif /* __KERNEL__ */ #ifndef HZ #define HZ 100 diff -urpN -X /home/fletch/.diff.exclude 100-early_printk/include/linux/timex.h 101-config_hz/include/linux/timex.h --- 100-early_printk/include/linux/timex.h Sun Nov 17 20:29:21 2002 +++ 101-config_hz/include/linux/timex.h Sun Apr 20 21:09:39 2003 @@ -76,7 +76,7 @@ #elif HZ >= 768 && HZ < 1536 # define SHIFT_HZ 10 #else -# error You lose. +# error Please use a HZ value which is between 12 and 1536 #endif /*