[SPARC64]: Move PTE field definitions back into asm/pgtable.h

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 0 insertions, 84 deletions

diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 9c2fc239f3ee..81f9f4bffaff 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -1334,90 +1334,6 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 }
 #endif
 
-/* SUN4U pte bits... */
-#define _PAGE_SZ4MB_4U    0x6000000000000000 /* 4MB Page               */
-#define _PAGE_SZ512K_4U   0x4000000000000000 /* 512K Page              */
-#define _PAGE_SZ64K_4U    0x2000000000000000 /* 64K Page               */
-#define _PAGE_SZ8K_4U     0x0000000000000000 /* 8K Page                */
-#define _PAGE_NFO_4U      0x1000000000000000 /* No Fault Only          */
-#define _PAGE_IE_4U       0x0800000000000000 /* Invert Endianness      */
-#define _PAGE_SOFT2_4U    0x07FC000000000000 /* Software bits, set 2   */
-#define _PAGE_RES1_4U     0x0002000000000000 /* Reserved               */
-#define _PAGE_SZ32MB_4U   0x0001000000000000 /* (Panther) 32MB page    */
-#define _PAGE_SZ256MB_4U  0x2001000000000000 /* (Panther) 256MB page   */
-#define _PAGE_SN_4U       0x0000800000000000 /* (Cheetah) Snoop        */
-#define _PAGE_RES2_4U     0x0000780000000000 /* Reserved               */
-#define _PAGE_PADDR_4U    0x000007FFFFFFE000 /* (Cheetah) paddr[42:13] */
-#define _PAGE_SOFT_4U     0x0000000000001F80 /* Software bits:         */
-#define _PAGE_EXEC_4U     0x0000000000001000 /* Executable SW bit      */
-#define _PAGE_MODIFIED_4U 0x0000000000000800 /* Modified (dirty)       */
-#define _PAGE_FILE_4U     0x0000000000000800 /* Pagecache page         */
-#define _PAGE_ACCESSED_4U 0x0000000000000400 /* Accessed (ref'd)       */
-#define _PAGE_READ_4U     0x0000000000000200 /* Readable SW Bit        */
-#define _PAGE_WRITE_4U    0x0000000000000100 /* Writable SW Bit        */
-#define _PAGE_PRESENT_4U  0x0000000000000080 /* Present                */
-#define _PAGE_L_4U        0x0000000000000040 /* Locked TTE             */
-#define _PAGE_CP_4U       0x0000000000000020 /* Cacheable in P-Cache   */
-#define _PAGE_CV_4U       0x0000000000000010 /* Cacheable in V-Cache   */
-#define _PAGE_E_4U        0x0000000000000008 /* side-Effect            */
-#define _PAGE_P_4U        0x0000000000000004 /* Privileged Page        */
-#define _PAGE_W_4U        0x0000000000000002 /* Writable               */
-
-/* SUN4V pte bits... */
-#define _PAGE_NFO_4V      0x4000000000000000 /* No Fault Only          */
-#define _PAGE_SOFT2_4V    0x3F00000000000000 /* Software bits, set 2   */
-#define _PAGE_MODIFIED_4V 0x2000000000000000 /* Modified (dirty)       */
-#define _PAGE_ACCESSED_4V 0x1000000000000000 /* Accessed (ref'd)       */
-#define _PAGE_READ_4V     0x0800000000000000 /* Readable SW Bit        */
-#define _PAGE_WRITE_4V    0x0400000000000000 /* Writable SW Bit        */
-#define _PAGE_PADDR_4V    0x00FFFFFFFFFFE000 /* paddr[55:13]           */
-#define _PAGE_IE_4V       0x0000000000001000 /* Invert Endianness      */
-#define _PAGE_E_4V        0x0000000000000800 /* side-Effect            */
-#define _PAGE_CP_4V       0x0000000000000400 /* Cacheable in P-Cache   */
-#define _PAGE_CV_4V       0x0000000000000200 /* Cacheable in V-Cache   */
-#define _PAGE_P_4V        0x0000000000000100 /* Privileged Page        */
-#define _PAGE_EXEC_4V     0x0000000000000080 /* Executable Page        */
-#define _PAGE_W_4V        0x0000000000000040 /* Writable               */
-#define _PAGE_SOFT_4V     0x0000000000000030 /* Software bits          */
-#define _PAGE_FILE_4V     0x0000000000000020 /* Pagecache page         */
-#define _PAGE_PRESENT_4V  0x0000000000000010 /* Present                */
-#define _PAGE_RESV_4V     0x0000000000000008 /* Reserved               */
-#define _PAGE_SZ16GB_4V   0x0000000000000007 /* 16GB Page              */
-#define _PAGE_SZ2GB_4V    0x0000000000000006 /* 2GB Page               */
-#define _PAGE_SZ256MB_4V  0x0000000000000005 /* 256MB Page             */
-#define _PAGE_SZ32MB_4V   0x0000000000000004 /* 32MB Page              */
-#define _PAGE_SZ4MB_4V    0x0000000000000003 /* 4MB Page               */
-#define _PAGE_SZ512K_4V   0x0000000000000002 /* 512K Page              */
-#define _PAGE_SZ64K_4V    0x0000000000000001 /* 64K Page               */
-#define _PAGE_SZ8K_4V     0x0000000000000000 /* 8K Page                */
-
-#if PAGE_SHIFT == 13
-#define _PAGE_SZBITS_4U _PAGE_SZ8K_4U
-#define _PAGE_SZBITS_4V _PAGE_SZ8K_4V
-#elif PAGE_SHIFT == 16
-#define _PAGE_SZBITS_4U _PAGE_SZ64K_4U
-#define _PAGE_SZBITS_4V _PAGE_SZ64K_4V
-#elif PAGE_SHIFT == 19
-#define _PAGE_SZBITS_4U _PAGE_SZ512K_4U
-#define _PAGE_SZBITS_4V _PAGE_SZ512K_4V
-#elif PAGE_SHIFT == 22
-#define _PAGE_SZBITS_4U _PAGE_SZ4MB_4U
-#define _PAGE_SZBITS_4V _PAGE_SZ4MB_4V
-#else
-#error Wrong PAGE_SHIFT specified
-#endif
-
-#if defined(CONFIG_HUGETLB_PAGE_SIZE_4MB)
-#define _PAGE_SZHUGE_4U _PAGE_SZ4MB_4U
-#define _PAGE_SZHUGE_4V _PAGE_SZ4MB_4V
-#elif defined(CONFIG_HUGETLB_PAGE_SIZE_512K)
-#define _PAGE_SZHUGE_4U _PAGE_SZ512K_4U
-#define _PAGE_SZHUGE_4V _PAGE_SZ512K_4V
-#elif defined(CONFIG_HUGETLB_PAGE_SIZE_64K)
-#define _PAGE_SZHUGE_4U _PAGE_SZ64K_4U
-#define _PAGE_SZHUGE_4V _PAGE_SZ64K_4V
-#endif
-
 #define _PAGE_CACHE_4U  (_PAGE_CP_4U | _PAGE_CV_4U)
 #define _PAGE_CACHE_4V  (_PAGE_CP_4V | _PAGE_CV_4V)
 #define __DIRTY_BITS_4U  (_PAGE_MODIFIED_4U | _PAGE_WRITE_4U | _PAGE_W_4U)