aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r--arch/parisc/kernel/entry.S4
-rw-r--r--arch/parisc/kernel/head.S4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 2ab16bb160a8..75819617f93b 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -398,7 +398,7 @@
398 * can address up to 1TB 398 * can address up to 1TB
399 */ 399 */
400 .macro L2_ptep pmd,pte,index,va,fault 400 .macro L2_ptep pmd,pte,index,va,fault
401#if PT_NLEVELS == 3 401#if CONFIG_PGTABLE_LEVELS == 3
402 extru \va,31-ASM_PMD_SHIFT,ASM_BITS_PER_PMD,\index 402 extru \va,31-ASM_PMD_SHIFT,ASM_BITS_PER_PMD,\index
403#else 403#else
404# if defined(CONFIG_64BIT) 404# if defined(CONFIG_64BIT)
@@ -436,7 +436,7 @@
436 * all ILP32 processes and all the kernel for machines with 436 * all ILP32 processes and all the kernel for machines with
437 * under 4GB of memory) */ 437 * under 4GB of memory) */
438 .macro L3_ptep pgd,pte,index,va,fault 438 .macro L3_ptep pgd,pte,index,va,fault
439#if PT_NLEVELS == 3 /* we might have a 2-Level scheme, e.g. with 16kb page size */ 439#if CONFIG_PGTABLE_LEVELS == 3 /* we might have a 2-Level scheme, e.g. with 16kb page size */
440 extrd,u \va,63-ASM_PGDIR_SHIFT,ASM_BITS_PER_PGD,\index 440 extrd,u \va,63-ASM_PGDIR_SHIFT,ASM_BITS_PER_PGD,\index
441 copy %r0,\pte 441 copy %r0,\pte
442 extrd,u,*= \va,63-ASM_PGDIR_SHIFT,64-ASM_PGDIR_SHIFT,%r0 442 extrd,u,*= \va,63-ASM_PGDIR_SHIFT,64-ASM_PGDIR_SHIFT,%r0
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S
index d4dc588c0dc1..e7d64527aff9 100644
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -74,7 +74,7 @@ $bss_loop:
74 mtctl %r4,%cr24 /* Initialize kernel root pointer */ 74 mtctl %r4,%cr24 /* Initialize kernel root pointer */
75 mtctl %r4,%cr25 /* Initialize user root pointer */ 75 mtctl %r4,%cr25 /* Initialize user root pointer */
76 76
77#if PT_NLEVELS == 3 77#if CONFIG_PGTABLE_LEVELS == 3
78 /* Set pmd in pgd */ 78 /* Set pmd in pgd */
79 load32 PA(pmd0),%r5 79 load32 PA(pmd0),%r5
80 shrd %r5,PxD_VALUE_SHIFT,%r3 80 shrd %r5,PxD_VALUE_SHIFT,%r3
@@ -97,7 +97,7 @@ $bss_loop:
97 stw %r3,0(%r4) 97 stw %r3,0(%r4)
98 ldo (PAGE_SIZE >> PxD_VALUE_SHIFT)(%r3),%r3 98 ldo (PAGE_SIZE >> PxD_VALUE_SHIFT)(%r3),%r3
99 addib,> -1,%r1,1b 99 addib,> -1,%r1,1b
100#if PT_NLEVELS == 3 100#if CONFIG_PGTABLE_LEVELS == 3
101 ldo ASM_PMD_ENTRY_SIZE(%r4),%r4 101 ldo ASM_PMD_ENTRY_SIZE(%r4),%r4
102#else 102#else
103 ldo ASM_PGD_ENTRY_SIZE(%r4),%r4 103 ldo ASM_PGD_ENTRY_SIZE(%r4),%r4