Update of /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv22898/linux/arch/i386/kernel
Modified Files:
setup.c
Log Message:
Synced to 2.5.21
Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/setup.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- setup.c 4 Jun 2002 19:45:05 -0000 1.45
+++ setup.c 15 Jun 2002 19:17:08 -0000 1.46
@@ -3,73 +3,16 @@
*
* Copyright (C) 1995 Linus Torvalds
*
- * Enhanced CPU type detection by Mike Jagdis, Patrick St. Jean
- * and Martin Mares, November 1997.
- *
- * Force Cyrix 6x86(MX) and M II processors to report MTRR capability
- * and Cyrix "coma bug" recognition by
- * Zoltán Böszörményi <zb...@ma...> February 1999.
- *
- * Force Centaur C6 processors to report MTRR capability.
[...2188 lines suppressed...]
- if(((ident>>8)&15)!=6)
- return 0;
-
- /* Pentium Pro */
-
- if(((ident>>4)&15)!=1)
- return 0;
-
- if((ident&15) < 8)
- {
- printk(KERN_INFO "Pentium Pro with Errata#50 detected. Taking evasive action.\n");
- return 1;
- }
- printk(KERN_INFO "Your Pentium Pro seems ok.\n");
- return 0;
-}
-
/*
* Local Variables:
* mode:c
|
