Skip to contentSkip to conversation

x86_64: kill stale mtrr_centaur_report_mcr

PATCH In review Adrian Bunk 2 participants 6 messages Jan 16, 2005 – Jan 17, 2005

lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 x86_64: kill stale mtrr_centaur_report_mcr

I didn't know the x86_64 port supports the Centaur CPU. ;-)

diffstat output:

 include/asm-x86_64/mtrr.h |    3 ---
 1 files changed, 3 deletions(-)
Signed-off-by Adrian Bunk <[email protected]>
include/asm-x86_64/mtrr.h renamed from include/asm-x86_64/mtrr.h.old +0 -3
@@ -79,7 +79,6 @@
 		     unsigned int type, char increment);
 extern int mtrr_del (int reg, unsigned long base, unsigned long size);
 extern int mtrr_del_page (int reg, unsigned long base, unsigned long size);
-extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi);
 #  else
 static __inline__ int mtrr_add (unsigned long base, unsigned long size,
 				unsigned int type, char increment)

@@ -102,8 +101,6 @@
     return -ENODEV;
 }
 
-static __inline__ void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) {}
-
 #  endif
 
 #endif
#1 lore raw
Quoted 1 line · Adrian Bunk

I didn't know the x86_64 port supports the Centaur CPU. ;-)

Have you actually compiled this? Most of the gunk in asm-x86_64/mtrr.h is because we share the MTRR driver with i386, and there is no good way to disable specific CPUs in there.

-Andi

Quoted 29 lines

diffstat output:

 include/asm-x86_64/mtrr.h |    3 ---
 1 files changed, 3 deletions(-)
Signed-off-by Adrian Bunk <[email protected]>
include/asm-x86_64/mtrr.h renamed from include/asm-x86_64/mtrr.h.old +0 -3
@@ -79,7 +79,6 @@
 		     unsigned int type, char increment);
 extern int mtrr_del (int reg, unsigned long base, unsigned long size);
 extern int mtrr_del_page (int reg, unsigned long base, unsigned long size);
-extern void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi);
 #  else
 static __inline__ int mtrr_add (unsigned long base, unsigned long size,
 				unsigned int type, char increment)

@@ -102,8 +101,6 @@
     return -ENODEV;
 }
 
-static __inline__ void mtrr_centaur_report_mcr(int mcr, u32 lo, u32 hi) {}
-
 #  endif
 
 #endif
author
#2 lore raw
Quoted 6 lines · Andi Kleen
Quoted 1 line · Adrian Bunk

I didn't know the x86_64 port supports the Centaur CPU. ;-)

Have you actually compiled this? Most of the gunk in asm-x86_64/mtrr.h is because we share the MTRR driver with i386, and there is no good way to disable specific CPUs in there.

If X86_64 wouldn't have hijyacked CONFIG_X86, you could simply put obj-$(CONFIG_X86) there...

I haven't tried to compile it, but OTOH I haven't yet found which dirty tricks you are using for compiling arch/i386/kernel/cpu/centaur.c on x86_64...

Quoted 1 line

-Andi

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#3 lore raw
Quoted 1 line · Adrian Bunk

I haven't tried to compile it, [...]

Please only submit compile tested patches in the future.

A cross compiler for x86-64 from i386 can be found at ftp://ftp.suse.com/pub/suse/x86_64/supplementary/CrossTools/8.1-i386/ (work with alien or rpm2cpio on non rpm systems too)

-Andi

author
#4 lore raw
Quoted 8 lines · Andi Kleen
Quoted 1 line · Adrian Bunk

I haven't tried to compile it, [...]

Please only submit compile tested patches in the future.

A cross compiler for x86-64 from i386 can be found at ftp://ftp.suse.com/pub/suse/x86_64/supplementary/CrossTools/8.1-i386/ (work with alien or rpm2cpio on non rpm systems too)

I tried this, but wasn't able to repruduce the compile error you observed.

Could you send me the .config you observed the problem with?

Quoted 1 line

-Andi

TIA
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#5 lore raw
Quoted 6 lines · Adrian Bunk
Quoted 5 lines · Andi Kleen
Quoted 1 line · Adrian Bunk

I haven't tried to compile it, [...]

Please only submit compile tested patches in the future.

Quoted 8 lines
Quoted 3 lines

A cross compiler for x86-64 from i386 can be found at ftp://ftp.suse.com/pub/suse/x86_64/supplementary/CrossTools/8.1-i386/ (work with alien or rpm2cpio on non rpm systems too)

I tried this, but wasn't able to repruduce the compile error you observed.

Could you send me the .config you observed the problem with?

I didn't see a problem, just asked if it really compiles. You're right that centaur is not linked in so it'll probably work.

I'll apply the patch, thanks.
-Andi