[PATCH] powerpc: Fix compile errors found by new ppc64e_defconfig

[Michael Ellerman]

On Fri, 2009-10-16 at 12:05 -0500, Kumar Gala wrote:
> Fix the following 3 issues:
> 
> arch/powerpc/kernel/process.c: In function 'arch_randomize_brk':
> arch/powerpc/kernel/process.c:1183: error: 'mmu_highuser_ssize' undeclared (first use in this function)
> arch/powerpc/kernel/process.c:1183: error: (Each undeclared identifier is reported only once
> arch/powerpc/kernel/process.c:1183: error: for each function it appears in.)
> arch/powerpc/kernel/process.c:1183: error: 'MMU_SEGSIZE_1T' undeclared (first use in this function)
> 
> In file included from arch/powerpc/kernel/setup_64.c:60:
> arch/powerpc/include/asm/mmu-hash64.h:132: error: redefinition of 'struct mmu_psize_def'
> arch/powerpc/include/asm/mmu-hash64.h:159: error: expected identifier or '(' before numeric constant
> arch/powerpc/include/asm/mmu-hash64.h:396: error: conflicting types for 'mm_context_t'
> arch/powerpc/include/asm/mmu-book3e.h:184: error: previous declaration of 'mm_context_t' was here
> 
> cc1: warnings being treated as errors
> arch/powerpc/kernel/pci_64.c: In function 'pcibios_unmap_io_space':
> arch/powerpc/kernel/pci_64.c:100: error: unused variable 'res'
> 
> Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
> ---
>  arch/powerpc/kernel/pci_64.c   |    2 ++
>  arch/powerpc/kernel/process.c  |    2 +-
>  arch/powerpc/kernel/setup_64.c |    1 -
>  3 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
> index ba949a2..ccf56ac 100644
> --- a/arch/powerpc/kernel/pci_64.c
> +++ b/arch/powerpc/kernel/pci_64.c
> @@ -97,7 +97,9 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
>  	 * to do an appropriate TLB flush here too
>  	 */
>  	if (bus->self) {
> +#ifdef CONFIG_PPC_STD_MMU_64
>  		struct resource *res = bus->resource[0];
> +#endif
>  
>  		pr_debug("IO unmapping for PCI-PCI bridge %s\n",
>  			 pci_name(bus->self));
104 
105 #ifdef CONFIG_PPC_STD_MMU_64                                                
106                 __flush_hash_table_range(&init_mm, res->start + _IO_BASE,
107                                          res->end + _IO_BASE + 1);
108 #endif
109		return 0;
110	 }

So just expand the ifdef around the pr_debug()?

cheers
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20091019/85a9dc15/attachment.pgp>