From 5fe74cb88599631b8812bd339b4b53af88a520a4 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Fri, 25 May 2012 21:20:18 +0000 Subject: [PATCH] --- yaml --- r: 309535 b: refs/heads/master c: b0acd2495e2a7f2655b9d4c761bd09e6dd05fbc4 h: refs/heads/master i: 309533: aacf614ffa5c53b15fd5597b63d5043d2b62f4be 309531: 5626908b0563a2d6f9ea1cbcfb94ee2983932c10 309527: 477769b851a7d84671fd5dbe09cce6a78c5cbb54 309519: 9ac25dce9aa979090c441b50725d37a3b4ed4394 309503: 566e2eba9853189b4998abaa521dabd9269ed872 v: v3 --- [refs] | 2 +- trunk/arch/sparc/include/asm/asi.h | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 38a16d96b0eb..0c56b8a33fe9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6729cf7967f6c11f6de6a0b43ec277905a00c146 +refs/heads/master: b0acd2495e2a7f2655b9d4c761bd09e6dd05fbc4 diff --git a/trunk/arch/sparc/include/asm/asi.h b/trunk/arch/sparc/include/asm/asi.h index cbb93e5141de..61ebe7411ceb 100644 --- a/trunk/arch/sparc/include/asm/asi.h +++ b/trunk/arch/sparc/include/asm/asi.h @@ -40,11 +40,7 @@ #define ASI_M_UNA01 0x01 /* Same here... */ #define ASI_M_MXCC 0x02 /* Access to TI VIKING MXCC registers */ #define ASI_M_FLUSH_PROBE 0x03 /* Reference MMU Flush/Probe; rw, ss */ -#ifndef CONFIG_SPARC_LEON #define ASI_M_MMUREGS 0x04 /* MMU Registers; rw, ss */ -#else -#define ASI_M_MMUREGS 0x19 -#endif /* CONFIG_SPARC_LEON */ #define ASI_M_TLBDIAG 0x05 /* MMU TLB only Diagnostics */ #define ASI_M_DIAGS 0x06 /* Reference MMU Diagnostics */ #define ASI_M_IODIAG 0x07 /* MMU I/O TLB only Diagnostics */