Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/Kconfig
	arch/arm/include/asm/localtimer.h
	arch/arm/kernel/Makefile
	arch/arm/mm/dma-mapping.c
	arch/arm/mm/proc-v7.S
	arch/arm/plat-omap/Kconfig

diff --cc arch/arm/Kconfig
index 0143e2e029023074483ca4c873fceddc871ca4f1,2686959319a043e532b3c44690bb2f60eb4208fb..7f1c1693e4c185b70b60d7b81aaa7736f19ad2b9
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -211,11 -212,20 +212,24 @@@ config ARM_PATCH_PHYS_VIR
          this feature (eg, building a kernel for a single machine) and
          you need to shrink the kernel to the minimal size.
  
+ config NEED_MACH_MEMORY_H
+       bool
+       help
+         Select this when mach/memory.h is required to provide special
+         definitions for this platform.  The need for mach/memory.h should
+         be avoided when possible.
+ 
+ config PHYS_OFFSET
+       hex "Physical address of main memory"
+       depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H
+       help
+         Please provide the physical address corresponding to the
+         location of main memory in your system.
  
 +config GENERIC_BUG
 +      def_bool y
 +      depends on BUG
 +
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"
@@@ -385,7 -400,7 +404,8 @@@ config ARCH_FOOTBRIDG
        select CPU_SA110
        select FOOTBRIDGE
        select GENERIC_CLOCKEVENTS
 +      select HAVE_IDE
+       select NEED_MACH_MEMORY_H
        help
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@@ -674,7 -692,7 +699,8 @@@ config ARCH_RP
        select NO_IOPORT
        select ARCH_SPARSEMEM_ENABLE
        select ARCH_USES_GETTIMEOFFSET
 +      select HAVE_IDE
+       select NEED_MACH_MEMORY_H
        help
          On the Acorn Risc-PC, Linux can support the internal IDE disk and
          CD-ROM interface, serial and parallel port, and the floppy drive.
@@@ -693,7 -711,7 +719,8 @@@ config ARCH_SA110
        select HAVE_SCHED_CLOCK
        select TICK_ONESHOT
        select ARCH_REQUIRE_GPIOLIB
 +      select HAVE_IDE
+       select NEED_MACH_MEMORY_H
        help
          Support for StrongARM 11x0 based boards.
  
@@@ -840,7 -861,7 +870,8 @@@ config ARCH_U30
        select CLKDEV_LOOKUP
        select HAVE_MACH_CLKDEV
        select GENERIC_GPIO
 +      select ARCH_REQUIRE_GPIOLIB
+       select NEED_MACH_MEMORY_H
        help
          Support for ST-Ericsson U300 series mobile platforms.
  

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

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

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

diff --cc arch/arm/include/asm/localtimer.h
index 6fd955d34c6523fdaddcf6d0eebbd366bdef178e,f5e1cec7e35cb58d4aeaaf505424b8231bcaebd5..c6a18424888ed4992ed05913e77e262eb3126723
--- 1/arch/arm/include/asm/localtimer.h
--- 2/arch/arm/include/asm/localtimer.h
+++ b/arch/arm/include/asm/localtimer.h
@@@ -10,7 -10,7 +10,8 @@@
  #ifndef __ASM_ARM_LOCALTIMER_H
  #define __ASM_ARM_LOCALTIMER_H
  
 +#include <linux/errno.h>
+ #include <linux/interrupt.h>
  
  struct clock_event_device;
  

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

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

diff --cc arch/arm/kernel/Makefile
index 68036eece340b61f36be50f304a03cb68e091318,7cac26c5f5024034fce89aade86286eea30c6129..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/debug.S
Simple merge

diff --cc arch/arm/kernel/head.S
index 239703dbdf4f6f1942f6ab944121a1c6c1851e9d,673c806cc1060068ba6fedf563d1e6f81d2b6f50..566c54c2a1fef28bffea090e89bcec998b73ede6
--- 1/arch/arm/kernel/head.S
--- 2/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@@ -238,10 -234,10 +238,10 @@@ __create_page_tables
         * This allows debug messages to be output
         * via a serial console before paging_init.
         */
-       addruart r7, r3
+       addruart r7, r3, r0
  
 -      mov     r3, r3, lsr #20
 -      mov     r3, r3, lsl #2
 +      mov     r3, r3, lsr #SECTION_SHIFT
 +      mov     r3, r3, lsl #PMD_ORDER
  
        add     r0, r4, r3
        rsb     r3, r3, #0x4000                 @ PTRS_PER_PGD*sizeof(long)

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

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

diff --cc arch/arm/kernel/smp.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-exynos4/mct.c
index ddd86864fb8313846428ba75c3ef523ce0508f56,85a1bb79f11c0fe72463f7aa461ced713c805c59..582b874aab0e7b60d69aa5cfbe6362917f24c6bd
--- 1/arch/arm/mach-exynos4/mct.c
--- 2/arch/arm/mach-exynos4/mct.c
+++ b/arch/arm/mach-exynos4/mct.c
@@@ -395,16 -391,15 +397,17 @@@ static void exynos4_mct_tick_init(struc
  }
  
  /* Setup the local clock events for a CPU */
 -void __cpuinit local_timer_setup(struct clock_event_device *evt)
 +int __cpuinit local_timer_setup(struct clock_event_device *evt)
  {
        exynos4_mct_tick_init(evt);
 +
 +      return 0;
  }
  
- int local_timer_ack(void)
+ void local_timer_stop(struct clock_event_device *evt)
  {
-       return 0;
+       evt->set_mode(CLOCK_EVT_MODE_UNUSED, evt);
+       disable_irq(evt->irq);
  }
  
  #endif /* CONFIG_LOCAL_TIMERS */

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
Simple merge

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-2430sdp.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)

diff --cc arch/arm/plat-omap/Kconfig
index 5b605a9eb0916634ab9e6e2b30ba8c55d24bce52,95732af7b208c5b43b3c547343a7468d83b1d7de..6f4edd3408c203815e3d496c7333bb05df24d746
--- 1/arch/arm/plat-omap/Kconfig
--- 2/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@@ -14,7 -14,7 +14,8 @@@ config ARCH_OMAP
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
 +      select HAVE_IDE
+       select NEED_MACH_MEMORY_H
        help
          "Systems based on omap7xx, omap15xx or omap16xx"