From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 18 Oct 2010 21:34:25 +0000 (+0100)
Subject: Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 'st-ux... 
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~24263^2~7
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=23beab76b490172a9ff3d52843e4d27a35b2a4c6;p=mirror_ubuntu-focal-kernel.git

Merge branches 'at91', 'dcache', 'ftrace', 'hwbpt', 'misc', 'mmci', 's3c', 'st-ux' and 'unwind' into devel
---

23beab76b490172a9ff3d52843e4d27a35b2a4c6
diff --cc Makefile
index 4df9873f83b2,92ab33f16cf0,cd2123b17b6e,4df9873f83b2,471c49fd2f43,031b61cb5274,4df9873f83b2,4df9873f83b2,031b61cb5274..cf7fcb3bf245
--- a/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 a7ed21f0136a,553b7cf17bfb,8d09765ce564,0fdd099d4a67,94360e7a7abc,92951103255a,a7ed21f0136a,a7ed21f0136a,92951103255a..b404e5eec0c1
--- a/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/smp_plat.h
index e6215305544a,963a338d567b,e6215305544a,e6215305544a,7f4e6633f753,e6215305544a,e6215305544a,e6215305544a,e6215305544a..f24c1b9e211d
--- a/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