From: Mark Brown <broonie@kernel.org>
Date: Mon, 9 Feb 2015 06:13:09 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~27
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e3b5dc5d8b12ca4f5ccf5cffc6e5712be791b129;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

Conflicts:
	arch/arm/mm/mmu.c
---

e3b5dc5d8b12ca4f5ccf5cffc6e5712be791b129
diff --cc arch/arm/mm/mmu.c
index 95f7a1c90326,4c7d5cddef35..a4e5cd5c3067
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@@ -707,8 -685,8 +707,9 @@@ static void __init alloc_init_pmd(pud_
  }
  
  static void __init alloc_init_pud(pgd_t *pgd, unsigned long addr,
- 	unsigned long end, unsigned long phys, const struct mem_type *type,
- 	bool force_pages)
+ 				  unsigned long end, phys_addr_t phys,
 -				  const struct mem_type *type)
++				  const struct mem_type *type,
++				  bool force_pages)
  {
  	pud_t *pud = pud_offset(pgd, addr);
  	unsigned long next;