diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-01-11 08:27:21 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-11 08:27:21 +0300 |
| commit | c38a04b1ba67e488d94ec680a7dddd4e32d6ddfb (patch) | |
| tree | aeda3dd9801217ffcebb3cb66e1b2731de96e29b | |
| parent | c9c47b6e27ca49fb0eea6b021b4919cb2467c8e1 (diff) | |
| download | linux-c38a04b1ba67e488d94ec680a7dddd4e32d6ddfb.tar.xz | |
powerpc/32: Fix compile error caused by pud_t/pgt_t confusion
PPC32 is still using asm-generic/4level-fixup.h, but asm-powerpc/page.h
was defining pud_t and pgd_t. Depending on the order in which files
got included, this could result in a compilation error. Tweak the ifdef
so that page.h doesn't try to define pud_t on ppc32 (which uses 2-level
page tables).
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | include/asm-powerpc/page.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-powerpc/page.h b/include/asm-powerpc/page.h index 76d7cb4b4ffc..0b82df483f7f 100644 --- a/include/asm-powerpc/page.h +++ b/include/asm-powerpc/page.h @@ -178,7 +178,7 @@ typedef unsigned long pmd_t; #define pmd_val(x) (x) #define __pmd(x) (x) -#ifndef CONFIG_PPC_64K_PAGES +#if defined(CONFIG_PPC64) && !defined(CONFIG_PPC_64K_PAGES) typedef unsigned long pud_t; #define pud_val(x) (x) #define __pud(x) (x) |