diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 21:11:43 +0100 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 21:11:43 +0100 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /include/asm-i386/bugs.h | |
| parent | Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powe... (diff) | |
| parent | Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 (diff) | |
| download | linux-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.xz linux-f630fe2817601314b2eb7ca5ddc23c7834646731.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-i386/bugs.h')
| -rw-r--r-- | include/asm-i386/bugs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-i386/bugs.h b/include/asm-i386/bugs.h index 38f1aebbbdb5..c90c7c499302 100644 --- a/include/asm-i386/bugs.h +++ b/include/asm-i386/bugs.h @@ -160,7 +160,7 @@ static void __init check_config(void) * If we configured ourselves for a TSC, we'd better have one! */ #ifdef CONFIG_X86_TSC - if (!cpu_has_tsc) + if (!cpu_has_tsc && !tsc_disable) panic("Kernel compiled for Pentium+, requires TSC feature!"); #endif |