lkml.org 
[lkml]   [2000]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
SubjectRe: Linux 2.2.18pre7
Alan,

#include <std_disclaimer.h>

> 2.2.18pre7
> o Identify chip and also handle MTRR for the (me)
> Cyrix III

linux/arch/i386/kernel/mtrr.c fails to compile;
"case X86_VENDOR_CENTAUR:" is duplicated, and boot_cpu.x86 should, I
believe, be boot_cpu_data.x86 in two places.

I'm attaching a patch, but since there are two ways to fix the
case-tags, there's at least a 51% probability I got it wrong; at least
it compiles here... since I don't have a box with a Cyrix chip,
successful compilation was my #1 priority.

--
\Peter.
--- linux/arch/i386/kernel/mtrr.c.orig Thu Sep 14 09:28:25 2000
+++ linux/arch/i386/kernel/mtrr.c Thu Sep 14 09:38:50 2000
@@ -442,10 +442,10 @@
/* Cyrix have 8 ARRs */
case X86_VENDOR_CENTAUR:
/* and Centaur has 8 MCR's */
- if(boot_cpu.x86==5)
+ if(boot_cpu_data.x86==5)
return 8;
/* the cyrix III has intel compatible MTRR */
- if(boot_cpu.x86==6)
+ if(boot_cpu_data.x86==6)
{
rdmsr (MTRRcap_MSR, config, dummy);
return (config & 0xff);
@@ -474,7 +474,6 @@
return (config & (1<<10));
/*break;*/
case X86_VENDOR_CYRIX:
- case X86_VENDOR_CENTAUR:
return 1;
/*break;*/
}
\
 
 \ /
  Last update: 2005-03-22 12:38    [W:0.078 / U:1.784 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site