linux-mips
[Top] [All Lists]

Re: ip32 kconfig patch

To: Paul Jakma <paul@clubi.ie>
Subject: Re: ip32 kconfig patch
From: Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>
Date: Sun, 28 Nov 2004 04:39:15 +0100
Cc: linux-mips@linux-mips.org
In-reply-to: <Pine.LNX.4.61.0411280316090.6275@sheen.jakma.org>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <Pine.LNX.4.61.0411280316090.6275@sheen.jakma.org>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.6i
Paul Jakma wrote:
> Hi,
> 
> IP32 needs the below to build CVS. rm7k_sc_enable and 
> __rm7k_sc_enable in arch/mips/mm/sc-r7k.c reference the MIPS32 
> KSEG{0,1}ADDR macros. I dont know enough about MIPS to fixup the 
> KSEGxADDR references unfortunately, but this lets me build for R10k 
> at least.

Use this patch instead.


Thiemo


Index: arch/mips/mm/sc-rm7k.c
===================================================================
RCS file: /home/cvs/linux/arch/mips/mm/sc-rm7k.c,v
retrieving revision 1.6
diff -u -p -r1.6 sc-rm7k.c
--- arch/mips/mm/sc-rm7k.c      24 Jun 2004 20:41:28 -0000      1.6
+++ arch/mips/mm/sc-rm7k.c      25 Nov 2004 18:17:47 -0000
@@ -96,13 +96,13 @@ static void rm7k_sc_inv(unsigned long ad
 }
 
 /*
- * This function is executed in the uncached segment KSEG1.
+ * This function is executed in the uncached segment CKSEG1.
  * It must not touch the stack, because the stack pointer still points
- * into KSEG0.
+ * into CKSEG0.
  *
  * Three options:
  *     - Write it in assembly and guarantee that we don't use the stack.
- *     - Disable caching for KSEG0 before calling it.
+ *     - Disable caching for CKSEG0 before calling it.
  *     - Pray that GCC doesn't randomly start using the stack.
  *
  * This being Linux, we obviously take the least sane of those options -
@@ -127,13 +127,13 @@ static __init void __rm7k_sc_enable(void
                      ".set mips0\n\t"
                      ".set reorder"
                      :
-                     : "r" (KSEG0ADDR(i)), "i" (Index_Store_Tag_SD));
+                     : "r" (CKSEG0ADDR(i)), "i" (Index_Store_Tag_SD));
        }
 }
 
 static __init void rm7k_sc_enable(void)
 {
-       void (*func)(void) = (void *) KSEG1ADDR(&__rm7k_sc_enable);
+       void (*func)(void) = (void *) CKSEG1ADDR(&__rm7k_sc_enable);
 
        if (read_c0_config() & 0x08)                    /* CONF_SE */
                return;

<Prev in Thread] Current Thread [Next in Thread>