Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 'st-ux...

diff --cc Makefile
index 4df9873f83b275a48037e86e058208fa9c6baffc,92ab33f16cf0a31256b754cf4f1f46fafb83d3a8,cd2123b17b6e0060661e9427b9cbbeea1291f5c5,4df9873f83b275a48037e86e058208fa9c6baffc,471c49fd2f434e0cdfdb937ba16d35bac828fe07,031b61cb5274f1d520b7f95fe44fd66b742d16d4,4df9873f83b275a48037e86e058208fa9c6baffc,4df9873f83b275a48037e86e058208fa9c6baffc,031b61cb5274f1d520b7f95fe44fd66b742d16d4..cf7fcb3bf24564132f19f4d14f1598382bbaff5e
--- 1/Makefile
--- 2/Makefile
--- 3/Makefile
--- 4/Makefile
--- 5/Makefile
--- 6/Makefile
--- 7/Makefile
--- 8/Makefile
--- 9/Makefile
+++ b/Makefile
@@@@@@@@@@ -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 -1,7 +1,7 @@@@@@@@@@
         VERSION = 2
         PATCHLEVEL = 6
         SUBLEVEL = 36
-  -  -- EXTRAVERSION = -rc3
 -       EXTRAVERSION = -rc4
  -  -  -EXTRAVERSION = -rc2
++++ ++++EXTRAVERSION = -rc6
         NAME = Sheep on Meth
         
         # *DOCUMENTATION*

diff --cc arch/arm/Kconfig
index a7ed21f0136a3e5e8f4ee863b3659dd9a8fc8027,553b7cf17bfb0bac057eaedf0402a0bca2aa47e8,8d09765ce564a3b67363142bc6ec8e5c9c8a225f,0fdd099d4a677550b9fa860920eb172c75ca48a8,94360e7a7abc77452f8074a7767c52e4aacc80f2,92951103255a1dff3e30d237a676f8d8bfa137e3,a7ed21f0136a3e5e8f4ee863b3659dd9a8fc8027,a7ed21f0136a3e5e8f4ee863b3659dd9a8fc8027,92951103255a1dff3e30d237a676f8d8bfa137e3..b404e5eec0c1d8b7e74c8c59ad02d32748435961
--- 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
@@@@@@@@@@ -1576,96 -1576,6 -1578,95 -1577,97 -1614,6 -1576,95 -1576,96 -1576,96 -1576,95 +1617,6 @@@@@@@@@@ config AUTO_ZRELADD
                  0xf8000000. This assumes the zImage being placed in the first 128MB
                  from start of memory.
         
- -- ----config ZRELADDR
- -- ----       hex "Physical address of the decompressed kernel image"
- -- ----       depends on !AUTO_ZRELADDR
- -- ----       default 0x00008000 if ARCH_BCMRING ||\
- -- ----               ARCH_CNS3XXX ||\
- -- ----               ARCH_DOVE ||\
- -- ----               ARCH_EBSA110 ||\
- -- ----               ARCH_FOOTBRIDGE ||\
- -- ----               ARCH_INTEGRATOR ||\
- -- ----               ARCH_IOP13XX ||\
- -- ----               ARCH_IOP33X ||\
- -- ----               ARCH_IXP2000 ||\
- -- ----               ARCH_IXP23XX ||\
- -- ----               ARCH_IXP4XX ||\
- -- ----               ARCH_KIRKWOOD ||\
- -- ----               ARCH_KS8695 ||\
- -- ----               ARCH_LOKI ||\
- -- ----               ARCH_MMP ||\
- -- ----               ARCH_MV78XX0 ||\
- -- ----               ARCH_NOMADIK ||\
- -- ----               ARCH_NUC93X ||\
- -- ----               ARCH_NS9XXX ||\
- -- ----               ARCH_ORION5X ||\
- -- ----               ARCH_SPEAR3XX ||\
- -- ----               ARCH_SPEAR6XX ||\
   -                    ARCH_TEGRA ||\
- -- ----               ARCH_U8500 ||\
- -- ----               ARCH_VERSATILE ||\
- -- ----               ARCH_W90X900
- -- ----       default 0x08008000 if ARCH_MX1 ||\
- -- ----               ARCH_SHARK
- -- ----       default 0x10008000 if ARCH_MSM ||\
- -- ----               ARCH_OMAP1 ||\
- -- ----               ARCH_RPC
- -- ----       default 0x20008000 if ARCH_S5P6440 ||\
- -- ----               ARCH_S5P6442 ||\
- -- ----               ARCH_S5PC100 ||\
- -- ----               ARCH_S5PV210
- -- ----       default 0x30008000 if ARCH_S3C2410 ||\
- -- ----               ARCH_S3C2400 ||\
- -- ----               ARCH_S3C2412 ||\
- -- ----               ARCH_S3C2416 ||\
- -- ----               ARCH_S3C2440 ||\
- -- ----               ARCH_S3C2443
- -- ----       default 0x40008000 if ARCH_STMP378X ||\
- -- ----               ARCH_STMP37XX ||\
- -- ----               ARCH_SH7372 ||\
-  -  --                ARCH_SH7377 ||\
-  -  --                ARCH_S5PV310
  -  -  -               ARCH_SH7377
- -- ----       default 0x50008000 if ARCH_S3C64XX ||\
- -- ----               ARCH_SH7367
- -- ----       default 0x60008000 if ARCH_VEXPRESS
- -- ----       default 0x80008000 if ARCH_MX25 ||\
- -- ----               ARCH_MX3 ||\
- -- ----               ARCH_NETX ||\
- -- ----               ARCH_OMAP2PLUS ||\
- -- ----               ARCH_PNX4008
- -- ----       default 0x90008000 if ARCH_MX5 ||\
- -- ----               ARCH_MX91231
- -- ----       default 0xa0008000 if ARCH_IOP32X ||\
- -- ----               ARCH_PXA ||\
- -- ----               MACH_MX27
- -- ----       default 0xc0008000 if ARCH_LH7A40X ||\
- -- ----               MACH_MX21
- -- ----       default 0xf0008000 if ARCH_AAEC2000 ||\
- -- ----               ARCH_L7200
- -- ----       default 0xc0028000 if ARCH_CLPS711X
- -- ----       default 0x70008000 if ARCH_AT91 && (ARCH_AT91CAP9 || ARCH_AT91SAM9G45)
- -- ----       default 0x20008000 if ARCH_AT91 && !(ARCH_AT91CAP9 || ARCH_AT91SAM9G45)
- -- ----       default 0xc0008000 if ARCH_DAVINCI && ARCH_DAVINCI_DA8XX
- -- ----       default 0x80008000 if ARCH_DAVINCI && !ARCH_DAVINCI_DA8XX
- -- ----       default 0x00008000 if ARCH_EP93XX && EP93XX_SDCE3_SYNC_PHYS_OFFSET
- -- ----       default 0xc0008000 if ARCH_EP93XX && EP93XX_SDCE0_PHYS_OFFSET
- -- ----       default 0xd0008000 if ARCH_EP93XX && EP93XX_SDCE1_PHYS_OFFSET
- -- ----       default 0xe0008000 if ARCH_EP93XX && EP93XX_SDCE2_PHYS_OFFSET
- -- ----       default 0xf0008000 if ARCH_EP93XX && EP93XX_SDCE3_ASYNC_PHYS_OFFSET
- -- ----       default 0x00008000 if ARCH_GEMINI && GEMINI_MEM_SWAP
- -- ----       default 0x10008000 if ARCH_GEMINI && !GEMINI_MEM_SWAP
- -- ----       default 0x70008000 if ARCH_REALVIEW && REALVIEW_HIGH_PHYS_OFFSET
- -- ----       default 0x00008000 if ARCH_REALVIEW && !REALVIEW_HIGH_PHYS_OFFSET
- -- ----       default 0xc0208000 if ARCH_SA1100 && SA1111
- -- ----       default 0xc0008000 if ARCH_SA1100 && !SA1111
- -- ----       default 0x30108000 if ARCH_S3C2410 && PM_H1940
- -- ----       default 0x28E08000 if ARCH_U300 && MACH_U300_SINGLE_RAM
- -- ----       default 0x48008000 if ARCH_U300 && !MACH_U300_SINGLE_RAM
- -- ----       help
- -- ----         ZRELADDR is the physical address where the decompressed kernel
- -- ----         image will be placed. ZRELADDR has to be specified when the
- -- ----         assumption of AUTO_ZRELADDR is not valid, or when ZBOOT_ROM is
- -- ----         selected.
- -- ----
         endmenu
         
         menu "CPU Power Management"

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

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

diff --cc arch/arm/include/asm/smp_plat.h
index e6215305544aa9c63db768c53a7c194fe38c6747,963a338d567bf9d5d82ce29670998c46cb7abfe3,e6215305544aa9c63db768c53a7c194fe38c6747,e6215305544aa9c63db768c53a7c194fe38c6747,7f4e6633f7533df31879b0f29c2e345d1480a8d1,e6215305544aa9c63db768c53a7c194fe38c6747,e6215305544aa9c63db768c53a7c194fe38c6747,e6215305544aa9c63db768c53a7c194fe38c6747,e6215305544aa9c63db768c53a7c194fe38c6747..f24c1b9e211dd180a6caf548260110a33f75b33c
--- 1/arch/arm/include/asm/smp_plat.h
--- 2/arch/arm/include/asm/smp_plat.h
--- 3/arch/arm/include/asm/smp_plat.h
--- 4/arch/arm/include/asm/smp_plat.h
--- 5/arch/arm/include/asm/smp_plat.h
--- 6/arch/arm/include/asm/smp_plat.h
--- 7/arch/arm/include/asm/smp_plat.h
--- 8/arch/arm/include/asm/smp_plat.h
--- 9/arch/arm/include/asm/smp_plat.h
+++ b/arch/arm/include/asm/smp_plat.h
@@@@@@@@@@ -13,9 -13,13 -13,9 -13,9 -31,12 -13,9 -13,9 -13,9 -13,9 +31,16 @@@@@@@@@@ static inline int tlb_ops_need_broadcas
                return ((read_cpuid_ext(CPUID_EXT_MMFR3) >> 12) & 0xf) < 2;
         }
         
+ +++++++#if !defined(CONFIG_SMP) || __LINUX_ARM_ARCH__ >= 7
+ +++++++#define cache_ops_need_broadcast()     0
+ +++++++#else
         static inline int cache_ops_need_broadcast(void)
         {
++++ ++++       if (!is_smp())
++++ ++++               return 0;
++++ ++++
                return ((read_cpuid_ext(CPUID_EXT_MMFR3) >> 12) & 0xf) < 1;
         }
+ +++++++#endif
         
         #endif

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

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

diff --cc arch/arm/kernel/entry-common.S
Simple merge

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

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