Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/kernel/Makefile
	arch/arm/mach-msm/board-msm7x30.c
	arch/arm/mm/dma-mapping.c
	arch/arm/mm/proc-v7.S

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/boot/compressed/Makefile
Simple merge

diff --cc arch/arm/common/gic.c
Simple merge

diff --cc arch/arm/include/asm/dma-mapping.h
Simple merge

diff --cc arch/arm/include/asm/mach/arch.h
Simple merge

diff --cc arch/arm/include/asm/memory.h
Simple merge

diff --cc arch/arm/include/asm/pgtable.h
Simple merge

diff --cc arch/arm/kernel/Makefile
index 68036eece340b61f36be50f304a03cb68e091318,8fa83f54c9672c968984ce153ff4eb60b784309e..16eed6aebfa45b9b1812001a782d5f9c8247976c
--- 1/arch/arm/kernel/Makefile
--- 2/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@@ -29,7 -29,7 +29,7 @@@ obj-$(CONFIG_MODULES)         += armksyms.o mo
  obj-$(CONFIG_ARTHUR)          += arthur.o
  obj-$(CONFIG_ISA_DMA)         += dma-isa.o
  obj-$(CONFIG_PCI)             += bios32.o isa.o
- obj-$(CONFIG_ARM_CPU_SUSPEND) += sleep.o
 -obj-$(CONFIG_PM_SLEEP)                += sleep.o suspend.o
++obj-$(CONFIG_ARM_CPU_SUSPEND) += sleep.o suspend.o
  obj-$(CONFIG_HAVE_SCHED_CLOCK)        += sched_clock.o
  obj-$(CONFIG_SMP)             += smp.o smp_tlb.o
  obj-$(CONFIG_HAVE_ARM_SCU)    += smp_scu.o

diff --cc arch/arm/kernel/perf_event_v7.c
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mach-clps711x/clep7312.c
Simple merge

diff --cc arch/arm/mach-clps711x/edb7211-arch.c
Simple merge

diff --cc arch/arm/mach-clps711x/fortunet.c
Simple merge

diff --cc arch/arm/mach-clps711x/p720t.c
Simple merge

diff --cc arch/arm/mach-ep93xx/edb93xx.c
Simple merge

diff --cc arch/arm/mach-ep93xx/simone.c
Simple merge

diff --cc arch/arm/mach-ep93xx/snappercl15.c
Simple merge

diff --cc arch/arm/mach-footbridge/cats-hw.c
Simple merge

diff --cc arch/arm/mach-footbridge/netwinder-hw.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx27ads.c
Simple merge

diff --cc arch/arm/mach-integrator/integrator_ap.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/dsmg600-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/fsg-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/nas100d-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/nslu2-setup.c
Simple merge

diff --cc arch/arm/mach-ks8695/board-acs5k.c
Simple merge

diff --cc arch/arm/mach-ks8695/board-dsm320.c
Simple merge

diff --cc arch/arm/mach-ks8695/board-micrel.c
Simple merge

diff --cc arch/arm/mach-lpc32xx/phy3250.c
Simple merge

diff --cc arch/arm/mach-msm/board-halibut.c
Simple merge

diff --cc arch/arm/mach-msm/board-mahimahi.c
Simple merge

diff --cc arch/arm/mach-msm/board-msm7x27.c
Simple merge

diff --cc arch/arm/mach-msm/board-msm7x30.c
index 9043417ea52fb025f8216f7c11607bf809634c79,5a2ab6855183bfff969b3f84a60934472f1de908..71de5062c71efd6d86e3e5a4e5927e7dbdf733ea
--- 1/arch/arm/mach-msm/board-msm7x30.c
--- 2/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@@ -121,9 -106,7 +121,9 @@@ static void __init msm7x30_map_io(void
  }
  
  MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")
-       .boot_params = PLAT_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,
 +      .fixup = msm7x30_fixup,
 +      .reserve = msm7x30_reserve,
        .map_io = msm7x30_map_io,
        .init_irq = msm7x30_init_irq,
        .init_machine = msm7x30_init,
@@@ -131,9 -114,7 +131,9 @@@
  MACHINE_END
  
  MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")
-       .boot_params = PLAT_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,
 +      .fixup = msm7x30_fixup,
 +      .reserve = msm7x30_reserve,
        .map_io = msm7x30_map_io,
        .init_irq = msm7x30_init_irq,
        .init_machine = msm7x30_init,
@@@ -141,9 -122,7 +141,9 @@@
  MACHINE_END
  
  MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")
-       .boot_params = PLAT_PHYS_OFFSET + 0x100,
+       .atag_offset = 0x100,
 +      .fixup = msm7x30_fixup,
 +      .reserve = msm7x30_reserve,
        .map_io = msm7x30_map_io,
        .init_irq = msm7x30_init_irq,
        .init_machine = msm7x30_init,

diff --cc arch/arm/mach-msm/board-qsd8x50.c
Simple merge

diff --cc arch/arm/mach-msm/board-sapphire.c
Simple merge

diff --cc arch/arm/mach-msm/board-trout.c
Simple merge

diff --cc arch/arm/mach-nomadik/board-nhk8815.c
Simple merge

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

diff --cc arch/arm/mach-omap1/board-fsample.c
Simple merge

diff --cc arch/arm/mach-omap1/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap1/board-h2.c
Simple merge

diff --cc arch/arm/mach-omap1/board-h3.c
Simple merge

diff --cc arch/arm/mach-omap1/board-htcherald.c
Simple merge

diff --cc arch/arm/mach-omap1/board-innovator.c
Simple merge

diff --cc arch/arm/mach-omap1/board-nokia770.c
Simple merge

diff --cc arch/arm/mach-omap1/board-osk.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmte.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmtt.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmz71.c
Simple merge

diff --cc arch/arm/mach-omap1/board-perseus2.c
Simple merge

diff --cc arch/arm/mach-omap1/board-sx1.c
Simple merge

diff --cc arch/arm/mach-omap1/board-voiceblue.c
Simple merge

diff --cc arch/arm/mach-omap2/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap2/board-h4.c
Simple merge

diff --cc arch/arm/mach-omap2/board-ldp.c
Simple merge

diff --cc arch/arm/mach-orion5x/db88f5281-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/dns323-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/kurobox_pro-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/mv2120-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f5182-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/terastation_pro2-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/ts209-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/ts409-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/wnr854t-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/wrt350n-v2-setup.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge

diff --cc arch/arm/mach-pxa/eseries.c
Simple merge

diff --cc arch/arm/mach-pxa/lpd270.c
Simple merge

diff --cc arch/arm/mach-pxa/mainstone.c
Simple merge

diff --cc arch/arm/mach-pxa/saar.c
Simple merge

diff --cc arch/arm/mach-pxa/saarb.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pb1176.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pbx.c
Simple merge

diff --cc arch/arm/mach-rpc/riscpc.c
Simple merge

diff --cc arch/arm/mach-s3c2412/mach-smdk2413.c
Simple merge

diff --cc arch/arm/mach-s3c2412/mach-vstms.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
Simple merge

diff --cc arch/arm/mach-sa1100/assabet.c
Simple merge

diff --cc arch/arm/mach-sa1100/simpad.c
Simple merge

diff --cc arch/arm/mach-tegra/board-harmony.c
Simple merge

diff --cc arch/arm/mach-tegra/board-paz00.c
Simple merge

diff --cc arch/arm/mach-tegra/board-trimslice.c
Simple merge

diff --cc arch/arm/mach-u300/core.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/mach-ux500/board-u5500.c
Simple merge

diff --cc arch/arm/mm/dma-mapping.c
index 235eb775fc78284180779d3eed96ccb357f8127c,50be842e89fd06ca43c9dd71a296509ad065bb1b..e4e7f6cba1ab4823fdbf0fe7ab2109bf6df89ed7
--- 1/arch/arm/mm/dma-mapping.c
--- 2/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@ -117,14 -119,10 +119,9 @@@ static void __dma_free_buffer(struct pa
  }
  
  #ifdef CONFIG_MMU
- /* Sanity check size */
- #if (CONSISTENT_DMA_SIZE % SZ_2M)
- #error "CONSISTENT_DMA_SIZE must be multiple of 2MiB"
- #endif
  
- #define CONSISTENT_OFFSET(x)  (((unsigned long)(x) - CONSISTENT_BASE) >> PAGE_SHIFT)
- #define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - CONSISTENT_BASE) >> PMD_SHIFT)
- #define NUM_CONSISTENT_PTES (CONSISTENT_DMA_SIZE >> PMD_SHIFT)
 -
+ #define CONSISTENT_OFFSET(x)  (((unsigned long)(x) - consistent_base) >> PAGE_SHIFT)
 -#define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - consistent_base) >> PGDIR_SHIFT)
++#define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - consistent_base) >> PMD_SHIFT)
  
  /*
   * These are the page tables (2MB each) covering uncached, DMA consistent allocations

diff --cc arch/arm/mm/init.c
Simple merge

diff --cc arch/arm/mm/mmu.c
Simple merge

diff --cc arch/arm/mm/proc-v7.S
index 9591c8e9fb8cc5db7d0668c62fcbfa40d9527f0b,6af366ce0165117914a9262d611a49ca8a808685..2c559ac381425d325757c68d83e73c37c77e6b5d
--- 1/arch/arm/mm/proc-v7.S
--- 2/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@@ -217,22 -217,20 +217,20 @@@ ENDPROC(cpu_v7_set_pte_ext
  
  /* Suspend/resume support: derived from arch/arm/mach-s5pv210/sleep.S */
  .globl        cpu_v7_suspend_size
- .equ  cpu_v7_suspend_size, 4 * 9
+ .equ  cpu_v7_suspend_size, 4 * 7
 -#ifdef CONFIG_PM_SLEEP
 +#ifdef CONFIG_ARM_CPU_SUSPEND
  ENTRY(cpu_v7_do_suspend)
-       stmfd   sp!, {r4 - r11, lr}
+       stmfd   sp!, {r4 - r10, lr}
        mrc     p15, 0, r4, c13, c0, 0  @ FCSE/PID
-       mrc     p15, 0, r5, c13, c0, 1  @ Context ID
-       mrc     p15, 0, r6, c13, c0, 3  @ User r/o thread ID
-       stmia   r0!, {r4 - r6}
+       mrc     p15, 0, r5, c13, c0, 3  @ User r/o thread ID
+       stmia   r0!, {r4 - r5}
        mrc     p15, 0, r6, c3, c0, 0   @ Domain ID
-       mrc     p15, 0, r7, c2, c0, 0   @ TTB 0
-       mrc     p15, 0, r8, c2, c0, 1   @ TTB 1
-       mrc     p15, 0, r9, c1, c0, 0   @ Control register
-       mrc     p15, 0, r10, c1, c0, 1  @ Auxiliary control register
-       mrc     p15, 0, r11, c1, c0, 2  @ Co-processor access control
-       stmia   r0, {r6 - r11}
-       ldmfd   sp!, {r4 - r11, pc}
+       mrc     p15, 0, r7, c2, c0, 1   @ TTB 1
+       mrc     p15, 0, r8, c1, c0, 0   @ Control register
+       mrc     p15, 0, r9, c1, c0, 1   @ Auxiliary control register
+       mrc     p15, 0, r10, c1, c0, 2  @ Co-processor access control
+       stmia   r0, {r6 - r10}
+       ldmfd   sp!, {r4 - r10, pc}
  ENDPROC(cpu_v7_do_suspend)
  
  ENTRY(cpu_v7_do_resume)