Merge branches 'amba', 'fixes', 'gpio', 'io' (early part), 'misc', 'p2v', 'pgt' and...

diff --cc arch/arm/Kconfig
index 3269576dbfa8dab12d6531996e2e86de2ca309c1,2c71a8f3535a1400c2d187e7fa612e00995e6927,3146ed3f6eca01a42068454e31f53a3330cc12c6,05589e85c1804d481a6f84e058c9b0e096677d73,2c71a8f3535a1400c2d187e7fa612e00995e6927,c7a76421ba2c3d113d983ca73b09816f9df0dec9,272eadc7a12cc552497dd3ad437c0ed76f7438a1,5ebc5d922ea14984e10ef8e10f47d414469efa7c,3269576dbfa8dab12d6531996e2e86de2ca309c1..f8b68a7cad7618ef2999d6258782468e688340e6
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
--- 4/arch/arm/Kconfig
--- 5/arch/arm/Kconfig
--- 6/arch/arm/Kconfig
--- 7/arch/arm/Kconfig
--- 8/arch/arm/Kconfig
--- 9/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@@@@@ -195,7 -195,8 -195,7 -195,8 -195,8 -195,7 -195,8 -195,7 -195,7 +195,8 @@@@@@@@@@ config VECTORS_BAS
                  The base address of exception vectors.
         
         config ARM_PATCH_PHYS_VIRT
- -  - --       bool "Patch physical to virtual translations at runtime"
 - --           bool "Patch physical to virtual translations at runtime (EXPERIMENTAL)"
 - --           depends on EXPERIMENTAL
++++++ ++       bool "Patch physical to virtual translations at runtime" if EMBEDDED
++++++ ++       default y
                depends on !XIP_KERNEL && MMU
                depends on !ARCH_REALVIEW || !SPARSEMEM
                help
@@@@@@@@@@ -204,17 -205,17 -204,17 -205,17 -205,17 -204,21 -205,13 -204,17 -204,17 +205,17 @@@@@@@@@@
                  kernel in system memory.
         
                  This can only be used with non-XIP MMU kernels where the base
------ --         of physical memory is at a 16MB boundary, or theoretically 64K
------ --         for the MSM machine class.
++++++ ++         of physical memory is at a 16MB boundary.
++++++ ++
++++++ ++         Only disable this option if you know that you do not require
++++++ ++         this feature (eg, building a kernel for a single machine) and
++++++ ++         you need to shrink the kernel to the minimal size.
  +    + 
-- ---  -config ARM_PATCH_PHYS_VIRT_16BIT
     -          def_bool y
     -          depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM
     -          help
     -            This option extends the physical to virtual translation patching
     -            to allow physical memory down to a theoretical minimum of 64K
     -            boundaries.
++ ++   +
  -    - config ARM_PATCH_PHYS_VIRT_16BIT
+++++ +++config GENERIC_BUG
      +         def_bool y
-----  --       depends on ARM_PATCH_PHYS_VIRT && ARCH_MSM
-----  --       help
-----  --         This option extends the physical to virtual translation patching
-----  --         to allow physical memory down to a theoretical minimum of 64K
-----  --         boundaries.
+++++ +++       depends on BUG
      +  
         source "init/Kconfig"
         
         source "kernel/Kconfig.freezer"
@@@@@@@@@@ -1271,18 -1272,6 -1271,32 -1273,6 -1272,6 -1275,18 -1267,6 -1271,6 -1271,18 +1272,32 @@@@@@@@@@ config ARM_ERRATA_75432
                  This workaround defines cpu_relax() as smp_mb(), preventing correctly
                  written polling loops from denying visibility of updates to memory.
         
 + ++ ++ config ARM_ERRATA_364296
 + ++ ++        bool "ARM errata: Possible cache data corruption with hit-under-miss enabled"
 + ++ ++        depends on CPU_V6 && !SMP
 + ++ ++        help
 + ++ ++          This options enables the workaround for the 364296 ARM1136
 + ++ ++          r0p2 erratum (possible cache data corruption with
 + ++ ++          hit-under-miss enabled). It sets the undocumented bit 31 in
 + ++ ++          the auxiliary control register and the FI bit in the control
 + ++ ++          register, thus disabling hit-under-miss without putting the
 + ++ ++          processor into full low interrupt latency mode. ARM11MPCore
 + ++ ++          is not affected.
 + ++ ++ 
++ ++++++config ARM_ERRATA_764369
++ ++++++       bool "ARM errata: Data cache line maintenance operation by MVA may not succeed"
++ ++++++       depends on CPU_V7 && SMP
++ ++++++       help
++ ++++++         This option enables the workaround for erratum 764369
++ ++++++         affecting Cortex-A9 MPCore with two or more processors (all
++ ++++++         current revisions). Under certain timing circumstances, a data
++ ++++++         cache line maintenance operation by MVA targeting an Inner
++ ++++++         Shareable memory region may fail to proceed up to either the
++ ++++++         Point of Coherency or to the Point of Unification of the
++ ++++++         system. This workaround adds a DSB instruction before the
++ ++++++         relevant cache maintenance functions and sets a specific bit
++ ++++++         in the diagnostic control register of the SCU.
++ ++++++
         endmenu
         
         source "arch/arm/common/Kconfig"

diff --cc arch/arm/kernel/Makefile
Simple merge

diff --cc arch/arm/kernel/head.S
Simple merge

diff --cc arch/arm/kernel/vmlinux.lds.S
index bf977f8514f60191e478e8e25a696c93d2802b87,bf977f8514f60191e478e8e25a696c93d2802b87,4e66f62b8d41f7321b7dcdc58ec9bd8730afc775,bf977f8514f60191e478e8e25a696c93d2802b87,bf977f8514f60191e478e8e25a696c93d2802b87,7b2541efd9f8cc1980fc57422eb7d19b2a15f716,bf977f8514f60191e478e8e25a696c93d2802b87,bf977f8514f60191e478e8e25a696c93d2802b87,bf977f8514f60191e478e8e25a696c93d2802b87..20b3041e0860f7c743f4e453a38c9ce738a10e75
--- 1/arch/arm/kernel/vmlinux.lds.S
--- 2/arch/arm/kernel/vmlinux.lds.S
--- 3/arch/arm/kernel/vmlinux.lds.S
--- 4/arch/arm/kernel/vmlinux.lds.S
--- 5/arch/arm/kernel/vmlinux.lds.S
--- 6/arch/arm/kernel/vmlinux.lds.S
--- 7/arch/arm/kernel/vmlinux.lds.S
--- 8/arch/arm/kernel/vmlinux.lds.S
--- 9/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@@@@@@@@@ -21,10 -21,10 -21,12 -21,10 -21,10 -21,11 -21,10 -21,10 -21,10 +21,13 @@@@@@@@@@
         #define ARM_CPU_KEEP(x)
         #endif
         
----- ---#if defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)
+++++ +++#if (defined(CONFIG_SMP_ON_UP) && !defined(CONFIG_DEBUG_SPINLOCK)) || \
+++++ +++       defined(CONFIG_GENERIC_BUG)
         #define ARM_EXIT_KEEP(x)       x
++ ++++++#define ARM_EXIT_DISCARD(x)
         #else
         #define ARM_EXIT_KEEP(x)
++ ++++++#define ARM_EXIT_DISCARD(x)    x
         #endif
         
         OUTPUT_ARCH(arm)

diff --cc arch/arm/mach-mmp/aspenite.c
Simple merge

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

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

diff --cc arch/arm/mach-sa1100/Makefile
Simple merge

diff --cc drivers/tty/serial/atmel_serial.c
Simple merge