Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=8bb809df6919f927bcb910bbc852d5724eaa1eb9
Commit:     8bb809df6919f927bcb910bbc852d5724eaa1eb9
Parent:     b3f6df9f21c6efc4641613188204aa0742bc9e22
Author:     Ralf Baechle <[EMAIL PROTECTED]>
AuthorDate: Tue Jul 10 17:32:56 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 17:32:56 2007 +0100

    [MIPS] Cleanup TO_PHYS_MASK definition
    
    No point in adding yet another #ifdef for Loongson since all this mask is
    being used for is converting an XKPHYS address into a physical address
    anyway.  So replace all definitions by one with the highest architectural
    possible value.
    
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/addrspace.h |   29 ++++++-----------------------
 1 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/include/asm-mips/addrspace.h b/include/asm-mips/addrspace.h
index 964c5ed..0b3ff9c 100644
--- a/include/asm-mips/addrspace.h
+++ b/include/asm-mips/addrspace.h
@@ -129,29 +129,12 @@
 #define PHYS_TO_XKPHYS(cm,a)           (_CONST64_(0x8000000000000000) | \
                                         ((cm)<<59) | (a))
 
-#if defined (CONFIG_CPU_R4300)                                         \
-    || defined (CONFIG_CPU_R4X00)                                      \
-    || defined (CONFIG_CPU_R5000)                                      \
-    || defined (CONFIG_CPU_RM7000)                                     \
-    || defined (CONFIG_CPU_RM9000)                                     \
-    || defined (CONFIG_CPU_NEVADA)                                     \
-    || defined (CONFIG_CPU_TX49XX)                                     \
-    || defined (CONFIG_CPU_MIPS64)
-#define TO_PHYS_MASK   _CONST64_(0x0000000fffffffff)   /* 2^^36 - 1 */
-#endif
-
-#if defined (CONFIG_CPU_R8000)
-/* We keep KUSIZE consistent with R4000 for now (2^^40) instead of (2^^48) */
-#define TO_PHYS_MASK   _CONST64_(0x000000ffffffffff)   /* 2^^40 - 1 */
-#endif
-
-#if defined (CONFIG_CPU_R10000)
-#define TO_PHYS_MASK   _CONST64_(0x000000ffffffffff)   /* 2^^40 - 1 */
-#endif
-
-#if defined(CONFIG_CPU_SB1) || defined(CONFIG_CPU_SB1A)
-#define TO_PHYS_MASK   _CONST64_(0x00000fffffffffff)   /* 2^^44 - 1 */
-#endif
+/*
+ * The ultimate limited of the 64-bit MIPS architecture:  2 bits for selecting
+ * the region, 3 bits for the CCA mode.  This leaves 59 bits of which the
+ * R8000 implements most with its 48-bit physical address space.
+ */
+#define TO_PHYS_MASK   _CONST64_(0x07ffffffffffffff)   /* 2^^59 - 1 */
 
 #ifndef CONFIG_CPU_R8000
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to