MIPS: Convert MIPS34K_MISSED_ITLB_WAR into a config option

[linux-2.6-microblaze.git] / arch / mips / include / asm / mipsregs.h

diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index 4ddc12e..3a7379b 100644 (file)
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -1706,12 +1706,6 @@ do {                                                                     \
 #define read_c0_count()                __read_32bit_c0_register($9, 0)
 #define write_c0_count(val)    __write_32bit_c0_register($9, 0, val)
 
-#define read_c0_count2()       __read_32bit_c0_register($9, 6) /* pnx8550 */
-#define write_c0_count2(val)   __write_32bit_c0_register($9, 6, val)
-
-#define read_c0_count3()       __read_32bit_c0_register($9, 7) /* pnx8550 */
-#define write_c0_count3(val)   __write_32bit_c0_register($9, 7, val)
-
 #define read_c0_entryhi()      __read_ulong_c0_register($10, 0)
 #define write_c0_entryhi(val)  __write_ulong_c0_register($10, 0, val)
 
@@ -1730,12 +1724,6 @@ do {                                                                     \
 #define read_c0_guestctl0ext() __read_32bit_c0_register($11, 4)
 #define write_c0_guestctl0ext(val) __write_32bit_c0_register($11, 4, val)
 
-#define read_c0_compare2()     __read_32bit_c0_register($11, 6) /* pnx8550 */
-#define write_c0_compare2(val) __write_32bit_c0_register($11, 6, val)
-
-#define read_c0_compare3()     __read_32bit_c0_register($11, 7) /* pnx8550 */
-#define write_c0_compare3(val) __write_32bit_c0_register($11, 7, val)
-
 #define read_c0_status()       __read_32bit_c0_register($12, 0)
 
 #define write_c0_status(val)   __write_32bit_c0_register($12, 0, val)
@@ -2728,7 +2716,7 @@ static inline void tlb_probe(void)
 
 static inline void tlb_read(void)
 {
-#if MIPS34K_MISSED_ITLB_WAR
+#ifdef CONFIG_WAR_MIPS34K_MISSED_ITLB
        int res = 0;
 
        __asm__ __volatile__(
@@ -2750,7 +2738,7 @@ static inline void tlb_read(void)
                "tlbr\n\t"
                ".set reorder");
 
-#if MIPS34K_MISSED_ITLB_WAR
+#ifdef CONFIG_WAR_MIPS34K_MISSED_ITLB
        if ((res & _ULCAST_(1)))
                __asm__ __volatile__(
                "       .set    push                            \n"