diff options
Diffstat (limited to 'arch/powerpc/mm/dump_linuxpagetables.c')
-rw-r--r-- | arch/powerpc/mm/dump_linuxpagetables.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/mm/dump_linuxpagetables.c b/arch/powerpc/mm/dump_linuxpagetables.c index c9282d27b203..c2e7dea59490 100644 --- a/arch/powerpc/mm/dump_linuxpagetables.c +++ b/arch/powerpc/mm/dump_linuxpagetables.c | |||
@@ -112,7 +112,7 @@ struct flag_info { | |||
112 | 112 | ||
113 | static const struct flag_info flag_array[] = { | 113 | static const struct flag_info flag_array[] = { |
114 | { | 114 | { |
115 | #ifdef CONFIG_PPC_STD_MMU_64 | 115 | #ifdef CONFIG_PPC_BOOK3S_64 |
116 | .mask = _PAGE_PRIVILEGED, | 116 | .mask = _PAGE_PRIVILEGED, |
117 | .val = 0, | 117 | .val = 0, |
118 | #else | 118 | #else |
@@ -147,7 +147,7 @@ static const struct flag_info flag_array[] = { | |||
147 | .set = "present", | 147 | .set = "present", |
148 | .clear = " ", | 148 | .clear = " ", |
149 | }, { | 149 | }, { |
150 | #ifdef CONFIG_PPC_STD_MMU_64 | 150 | #ifdef CONFIG_PPC_BOOK3S_64 |
151 | .mask = H_PAGE_HASHPTE, | 151 | .mask = H_PAGE_HASHPTE, |
152 | .val = H_PAGE_HASHPTE, | 152 | .val = H_PAGE_HASHPTE, |
153 | #else | 153 | #else |
@@ -157,7 +157,7 @@ static const struct flag_info flag_array[] = { | |||
157 | .set = "hpte", | 157 | .set = "hpte", |
158 | .clear = " ", | 158 | .clear = " ", |
159 | }, { | 159 | }, { |
160 | #ifndef CONFIG_PPC_STD_MMU_64 | 160 | #ifndef CONFIG_PPC_BOOK3S_64 |
161 | .mask = _PAGE_GUARDED, | 161 | .mask = _PAGE_GUARDED, |
162 | .val = _PAGE_GUARDED, | 162 | .val = _PAGE_GUARDED, |
163 | .set = "guarded", | 163 | .set = "guarded", |
@@ -174,7 +174,7 @@ static const struct flag_info flag_array[] = { | |||
174 | .set = "accessed", | 174 | .set = "accessed", |
175 | .clear = " ", | 175 | .clear = " ", |
176 | }, { | 176 | }, { |
177 | #ifndef CONFIG_PPC_STD_MMU_64 | 177 | #ifndef CONFIG_PPC_BOOK3S_64 |
178 | .mask = _PAGE_WRITETHRU, | 178 | .mask = _PAGE_WRITETHRU, |
179 | .val = _PAGE_WRITETHRU, | 179 | .val = _PAGE_WRITETHRU, |
180 | .set = "write through", | 180 | .set = "write through", |
@@ -450,7 +450,7 @@ static void populate_markers(void) | |||
450 | address_markers[i++].start_address = PHB_IO_END; | 450 | address_markers[i++].start_address = PHB_IO_END; |
451 | address_markers[i++].start_address = IOREMAP_BASE; | 451 | address_markers[i++].start_address = IOREMAP_BASE; |
452 | address_markers[i++].start_address = IOREMAP_END; | 452 | address_markers[i++].start_address = IOREMAP_END; |
453 | #ifdef CONFIG_PPC_STD_MMU_64 | 453 | #ifdef CONFIG_PPC_BOOK3S_64 |
454 | address_markers[i++].start_address = H_VMEMMAP_BASE; | 454 | address_markers[i++].start_address = H_VMEMMAP_BASE; |
455 | #else | 455 | #else |
456 | address_markers[i++].start_address = VMEMMAP_BASE; | 456 | address_markers[i++].start_address = VMEMMAP_BASE; |