diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2007-05-07 22:46:49 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:40:31 -0400 |
commit | d1953c8888ef034b912ee33bc2ea2cce6a414402 (patch) | |
tree | 525e581603a2dd8622b821304440b6ce14b535ae /arch/powerpc/lib | |
parent | 00c2ae35bd50664bcd841becc6efceef8aa5d074 (diff) |
[POWERPC] Remove use of 4level-fixup.h for ppc32
For 32-bit systems, powerpc still relies on the 4level-fixup.h hack,
to pretend that the generic pagetable handling stuff is 3-levels
rather than 4. This patch removes this, instead using the newer
pgtable-nopmd.h to handle the elision of both the pud and pmd
pagetable levels (ppc32 pagetables are actually 2 levels).
This removes a little extraneous code, and makes it more easily
compared to the 64-bit pagetable code.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/lib')
-rw-r--r-- | arch/powerpc/lib/dma-noncoherent.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/lib/dma-noncoherent.c b/arch/powerpc/lib/dma-noncoherent.c index 48f3d13a3de5..6656d47841d0 100644 --- a/arch/powerpc/lib/dma-noncoherent.c +++ b/arch/powerpc/lib/dma-noncoherent.c | |||
@@ -306,13 +306,15 @@ EXPORT_SYMBOL(__dma_free_coherent); | |||
306 | static int __init dma_alloc_init(void) | 306 | static int __init dma_alloc_init(void) |
307 | { | 307 | { |
308 | pgd_t *pgd; | 308 | pgd_t *pgd; |
309 | pud_t *pud; | ||
309 | pmd_t *pmd; | 310 | pmd_t *pmd; |
310 | pte_t *pte; | 311 | pte_t *pte; |
311 | int ret = 0; | 312 | int ret = 0; |
312 | 313 | ||
313 | do { | 314 | do { |
314 | pgd = pgd_offset(&init_mm, CONSISTENT_BASE); | 315 | pgd = pgd_offset(&init_mm, CONSISTENT_BASE); |
315 | pmd = pmd_alloc(&init_mm, pgd, CONSISTENT_BASE); | 316 | pud = pud_alloc(&init_mm, pgd, CONSISTENT_BASE); |
317 | pmd = pmd_alloc(&init_mm, pud, CONSISTENT_BASE); | ||
316 | if (!pmd) { | 318 | if (!pmd) { |
317 | printk(KERN_ERR "%s: no pmd tables\n", __func__); | 319 | printk(KERN_ERR "%s: no pmd tables\n", __func__); |
318 | ret = -ENOMEM; | 320 | ret = -ENOMEM; |