projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[CRYPTO] api: Add async block cipher interface
[powerpc.git]
/
include
/
asm-i386
/
bugs.h
diff --git
a/include/asm-i386/bugs.h
b/include/asm-i386/bugs.h
index
38f1aeb
..
c90c7c4
100644
(file)
--- 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 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
panic("Kernel compiled for Pentium+, requires TSC feature!");
#endif