diff options
| -rw-r--r-- | arch/sparc/mm/init_64.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index ed82edad1a39..e295a5b30ac9 100644 --- a/arch/sparc/mm/init_64.c +++ b/arch/sparc/mm/init_64.c | |||
| @@ -1722,7 +1722,7 @@ static void __init sun4v_linear_pte_xor_finalize(void) | |||
| 1722 | #ifndef CONFIG_DEBUG_PAGEALLOC | 1722 | #ifndef CONFIG_DEBUG_PAGEALLOC |
| 1723 | if (cpu_pgsz_mask & HV_PGSZ_MASK_256MB) { | 1723 | if (cpu_pgsz_mask & HV_PGSZ_MASK_256MB) { |
| 1724 | kern_linear_pte_xor[1] = (_PAGE_VALID | _PAGE_SZ256MB_4V) ^ | 1724 | kern_linear_pte_xor[1] = (_PAGE_VALID | _PAGE_SZ256MB_4V) ^ |
| 1725 | 0xfffff80000000000UL; | 1725 | PAGE_OFFSET; |
| 1726 | kern_linear_pte_xor[1] |= (_PAGE_CP_4V | _PAGE_CV_4V | | 1726 | kern_linear_pte_xor[1] |= (_PAGE_CP_4V | _PAGE_CV_4V | |
| 1727 | _PAGE_P_4V | _PAGE_W_4V); | 1727 | _PAGE_P_4V | _PAGE_W_4V); |
| 1728 | } else { | 1728 | } else { |
| @@ -1731,7 +1731,7 @@ static void __init sun4v_linear_pte_xor_finalize(void) | |||
| 1731 | 1731 | ||
| 1732 | if (cpu_pgsz_mask & HV_PGSZ_MASK_2GB) { | 1732 | if (cpu_pgsz_mask & HV_PGSZ_MASK_2GB) { |
| 1733 | kern_linear_pte_xor[2] = (_PAGE_VALID | _PAGE_SZ2GB_4V) ^ | 1733 | kern_linear_pte_xor[2] = (_PAGE_VALID | _PAGE_SZ2GB_4V) ^ |
| 1734 | 0xfffff80000000000UL; | 1734 | PAGE_OFFSET; |
| 1735 | kern_linear_pte_xor[2] |= (_PAGE_CP_4V | _PAGE_CV_4V | | 1735 | kern_linear_pte_xor[2] |= (_PAGE_CP_4V | _PAGE_CV_4V | |
| 1736 | _PAGE_P_4V | _PAGE_W_4V); | 1736 | _PAGE_P_4V | _PAGE_W_4V); |
| 1737 | } else { | 1737 | } else { |
| @@ -1740,7 +1740,7 @@ static void __init sun4v_linear_pte_xor_finalize(void) | |||
| 1740 | 1740 | ||
| 1741 | if (cpu_pgsz_mask & HV_PGSZ_MASK_16GB) { | 1741 | if (cpu_pgsz_mask & HV_PGSZ_MASK_16GB) { |
| 1742 | kern_linear_pte_xor[3] = (_PAGE_VALID | _PAGE_SZ16GB_4V) ^ | 1742 | kern_linear_pte_xor[3] = (_PAGE_VALID | _PAGE_SZ16GB_4V) ^ |
| 1743 | 0xfffff80000000000UL; | 1743 | PAGE_OFFSET; |
| 1744 | kern_linear_pte_xor[3] |= (_PAGE_CP_4V | _PAGE_CV_4V | | 1744 | kern_linear_pte_xor[3] |= (_PAGE_CP_4V | _PAGE_CV_4V | |
| 1745 | _PAGE_P_4V | _PAGE_W_4V); | 1745 | _PAGE_P_4V | _PAGE_W_4V); |
| 1746 | } else { | 1746 | } else { |
| @@ -2261,10 +2261,10 @@ static void __init sun4u_pgprot_init(void) | |||
| 2261 | __ACCESS_BITS_4U | _PAGE_E_4U); | 2261 | __ACCESS_BITS_4U | _PAGE_E_4U); |
| 2262 | 2262 | ||
| 2263 | #ifdef CONFIG_DEBUG_PAGEALLOC | 2263 | #ifdef CONFIG_DEBUG_PAGEALLOC |
| 2264 | kern_linear_pte_xor[0] = _PAGE_VALID ^ 0xfffff80000000000UL; | 2264 | kern_linear_pte_xor[0] = _PAGE_VALID ^ PAGE_OFFSET; |
| 2265 | #else | 2265 | #else |
| 2266 | kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZ4MB_4U) ^ | 2266 | kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZ4MB_4U) ^ |
| 2267 | 0xfffff80000000000UL; | 2267 | PAGE_OFFSET; |
| 2268 | #endif | 2268 | #endif |
| 2269 | kern_linear_pte_xor[0] |= (_PAGE_CP_4U | _PAGE_CV_4U | | 2269 | kern_linear_pte_xor[0] |= (_PAGE_CP_4U | _PAGE_CV_4U | |
| 2270 | _PAGE_P_4U | _PAGE_W_4U); | 2270 | _PAGE_P_4U | _PAGE_W_4U); |
| @@ -2308,10 +2308,10 @@ static void __init sun4v_pgprot_init(void) | |||
| 2308 | _PAGE_CACHE = _PAGE_CACHE_4V; | 2308 | _PAGE_CACHE = _PAGE_CACHE_4V; |
| 2309 | 2309 | ||
| 2310 | #ifdef CONFIG_DEBUG_PAGEALLOC | 2310 | #ifdef CONFIG_DEBUG_PAGEALLOC |
| 2311 | kern_linear_pte_xor[0] = _PAGE_VALID ^ 0xfffff80000000000UL; | 2311 | kern_linear_pte_xor[0] = _PAGE_VALID ^ PAGE_OFFSET; |
| 2312 | #else | 2312 | #else |
| 2313 | kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZ4MB_4V) ^ | 2313 | kern_linear_pte_xor[0] = (_PAGE_VALID | _PAGE_SZ4MB_4V) ^ |
| 2314 | 0xfffff80000000000UL; | 2314 | PAGE_OFFSET; |
| 2315 | #endif | 2315 | #endif |
| 2316 | kern_linear_pte_xor[0] |= (_PAGE_CP_4V | _PAGE_CV_4V | | 2316 | kern_linear_pte_xor[0] |= (_PAGE_CP_4V | _PAGE_CV_4V | |
| 2317 | _PAGE_P_4V | _PAGE_W_4V); | 2317 | _PAGE_P_4V | _PAGE_W_4V); |
