[Linuxconsole-commit]CVS: ruby/linux/arch/i386/kernel setup.c,1.39,1.40

[James S. <jsi...@us...>]

Update of /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv8328/linux/arch/i386/kernel

Modified Files:
	setup.c 
Log Message:
Synced to 2.5.9. Note some of the fb changes went into 2.5.9. Yeah :-)

Index: setup.c
===================================================================
RCS file: /cvsroot/linuxconsole/ruby/linux/arch/i386/kernel/setup.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- setup.c	16 Apr 2002 17:41:47 -0000	1.39
+++ setup.c	24 Apr 2002 18:56:50 -0000	1.40
@@ -2141,6 +2141,11 @@
 		strcpy(c->x86_model_id, p);
 	
 #ifdef CONFIG_SMP
+	/* PGE CPUID bug: Pentium4 supports PGE, but seems to have SMP bugs.. */
+	if ( c->x86 == 15 )
+		clear_bit(X86_FEATURE_PGE, c->x86_capability);
+
+
 	if (test_bit(X86_FEATURE_HT, c->x86_capability)) {
 		extern	int phys_proc_id[NR_CPUS];