From: Paul Mackerras Date: Wed, 11 Jan 2006 05:27:21 +0000 (+1100) Subject: powerpc/32: Fix compile error caused by pud_t/pgt_t confusion X-Git-Tag: v2.6.16-rc1~425^2~2 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c38a04b1ba67e488d94ec680a7dddd4e32d6ddfb;p=linux-2.6 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 --- diff --git a/include/asm-powerpc/page.h b/include/asm-powerpc/page.h index 76d7cb4b4f..0b82df483f 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)