From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 29 Jul 2011 01:55:50 +0000 (+1000)
Subject: Merge remote-tracking branch 'arm-lpae/for-next'
X-Git-Tag: next-20110729~82
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b0347256ca02868a50298c49dc3fb62fdc5cfb6;p=karo-tx-linux.git

Merge remote-tracking branch 'arm-lpae/for-next'

Conflicts:
	arch/arm/include/asm/pgalloc.h
	arch/arm/include/asm/pgtable.h
	arch/arm/include/asm/proc-fns.h
	arch/arm/include/asm/tlb.h
	arch/arm/mm/context.c
	arch/arm/mm/proc-v7.S
---

8b0347256ca02868a50298c49dc3fb62fdc5cfb6
diff --cc arch/arm/include/asm/proc-fns.h
index 633d1cb84d87,b5db4f415efd..34e852c636e0
--- a/arch/arm/include/asm/proc-fns.h
+++ b/arch/arm/include/asm/proc-fns.h
@@@ -79,16 -83,24 +83,20 @@@ extern void cpu_proc_fin(void)
  extern int cpu_do_idle(void);
  extern void cpu_dcache_clean_area(void *, int);
  extern void cpu_do_switch_mm(unsigned long pgd_phys, struct mm_struct *mm);
+ #ifdef CONFIG_ARM_LPAE
+ extern void cpu_set_pte_ext(pte_t *ptep, pte_t pte);
+ #else
  extern void cpu_set_pte_ext(pte_t *ptep, pte_t pte, unsigned int ext);
+ #endif
  extern void cpu_reset(unsigned long addr) __attribute__((noreturn));
  #else
 -#define cpu_proc_init()			processor._proc_init()
 -#define cpu_proc_fin()			processor._proc_fin()
 -#define cpu_reset(addr)			processor.reset(addr)
 -#define cpu_do_idle()			processor._do_idle()
 -#define cpu_dcache_clean_area(addr,sz)	processor.dcache_clean_area(addr,sz)
 -#ifdef CONFIG_ARM_LPAE
 -#define cpu_set_pte_ext(ptep,pte)	processor.set_pte_ext(ptep,pte)
 -#else
 -#define cpu_set_pte_ext(ptep,pte,ext)	processor.set_pte_ext(ptep,pte,ext)
 -#endif
 -#define cpu_do_switch_mm(pgd,mm)	processor.switch_mm(pgd,mm)
 +#define cpu_proc_init			processor._proc_init
 +#define cpu_proc_fin			processor._proc_fin
 +#define cpu_reset			processor.reset
 +#define cpu_do_idle			processor._do_idle
 +#define cpu_dcache_clean_area		processor.dcache_clean_area
 +#define cpu_set_pte_ext			processor.set_pte_ext
 +#define cpu_do_switch_mm		processor.switch_mm
  #endif
  
  extern void cpu_resume(void);