From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 13 Jul 2013 21:58:36 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=bfd65dd9fe42b54c6f4eabbabc40bda9e25dcf93;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

Pull ARM fixes from Russell King:
 "A few fixes for ARM, mostly just one liners with the exception of the
  missing section specification.  We decided not to rely on .previous to
  fix this but to explicitly state the section we want the code to be
  in."

* 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
  ARM: 7778/1: smp_twd: twd_update_frequency need be run on all online CPUs
  ARM: 7782/1: Kconfig: Let ARM_ERRATA_364296 not depend on CONFIG_SMP
  ARM: mm: fix boot on SA1110 Assabet
  ARM: 7781/1: mmu: Add debug_ll_io_init() mappings to early mappings
  ARM: 7780/1: add missing linker section markup to head-common.S
---

bfd65dd9fe42b54c6f4eabbabc40bda9e25dcf93
diff --cc arch/arm/mm/init.c
index 6833cbead6cc,0ecc43fd6229..15225d829d71
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@@ -597,7 -600,7 +597,7 @@@ void __init mem_init(void
  
  #ifdef CONFIG_SA1111
  	/* now that our DMA memory is actually so designated, we can free it */
- 	free_reserved_area(__va(PHYS_PFN_OFFSET), swapper_pg_dir, -1, NULL);
 -	free_reserved_area(__va(PHYS_OFFSET), swapper_pg_dir, 0, NULL);
++	free_reserved_area(__va(PHYS_OFFSET), swapper_pg_dir, -1, NULL);
  #endif
  
  	free_highpages();