Skip to contentSkip to conversation

linking problem with 2.6.0-test6-bk10 (fwd)

PATCH Adrian Bunk 2 participants 2 messages Dec 7, 2003

lore
Share & tools
lore
#0 lore raw

Hi Dave,

the trivial patch by Nuno Monteiro forwarded below still applies against -test11. Is there a reason why it wasn't applied?

cu
Adrian

----- Forwarded message from Nuno Monteiro <[email protected]> -----

Date: Fri, 10 Oct 2003 02:42:06 +0100
From: Nuno Monteiro <[email protected]>
To: Dave Jones <[email protected]>
Cc: [email protected], [email protected]
Subject: Re: [PATCH] Re: linking problem with 2.6.0-test6-bk10

Quoted 10 lines · Dave Jones

As well as looking pretty ugly, I can't convince myself this is safe. I think it's going to be better off making that whole code compile out if MTRRs are disabled. MTRR is a must-have if we want this code to actually work anyway.

Either change the ifdef at the top of centaur.c to #ifdef CONFIG_X86_OOSTORE && CONFIG_MTRR, or futz around it in the Kconfig, by changing the X86_OOSTORE depends line to

Hi Dave,

Right you are :)

Here is the updated fix.

arch/i386/Kconfig renamed from arch/i386/Kconfig.orig +1 -1
@@ -394,7 +394,7 @@ config X86_USE_3DNOW
 
 config X86_OOSTORE
 	bool
-	depends on MWINCHIP3D || MWINCHIP2 || MWINCHIPC6
+	depends on (MWINCHIP3D || MWINCHIP2 || MWINCHIPC6) && MTRR
 	default y
 
 config HPET_TIMER

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

----- End forwarded message -----

#1 lore raw
Quoted 4 lines · Adrian Bunk

Hi Dave,

the trivial patch by Nuno Monteiro forwarded below still applies against -test11. Is there a reason why it wasn't applied?

Another one that Linus deemed 'not critical' I guess.
I've been scooping up a bunch of these ready for when the 'time is right'.

Dave