Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

Pull ARM fixes from Russell King:

 - Fix early_iounmap

 - Drop cc-option fallbacks for architecture selection

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9156/1: drop cc-option fallbacks for architecture selection
  ARM: 9155/1: fix early early_iounmap()

diff --combined arch/arm/Makefile
index a522716565c6fc733355526e91673da337d97db1,fa45837b8065cac1fa7b61c2ed845e59b32b5988..77172d555c7e722fce05a04022cde085a7aecb42
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -60,15 -60,15 +60,15 @@@ KBUILD_CFLAGS      += $(call cc-option,-fno-
  # Note that GCC does not numerically define an architecture version
  # macro, but instead defines a whole series of macros which makes
  # testing for a specific architecture or later rather impossible.
- arch-$(CONFIG_CPU_32v7M)      =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m
- arch-$(CONFIG_CPU_32v7)               =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a)
- arch-$(CONFIG_CPU_32v6)               =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6)
+ arch-$(CONFIG_CPU_32v7M)      =-D__LINUX_ARM_ARCH__=7 -march=armv7-m
+ arch-$(CONFIG_CPU_32v7)               =-D__LINUX_ARM_ARCH__=7 -march=armv7-a
+ arch-$(CONFIG_CPU_32v6)               =-D__LINUX_ARM_ARCH__=6 -march=armv6
  # Only override the compiler option if ARMv6. The ARMv6K extensions are
  # always available in ARMv7
  ifeq ($(CONFIG_CPU_32v6),y)
- arch-$(CONFIG_CPU_32v6K)      =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6k,-march=armv5t -Wa$(comma)-march=armv6k)
+ arch-$(CONFIG_CPU_32v6K)      =-D__LINUX_ARM_ARCH__=6 -march=armv6k
  endif
- arch-$(CONFIG_CPU_32v5)               =-D__LINUX_ARM_ARCH__=5 $(call cc-option,-march=armv5te,-march=armv4t)
+ arch-$(CONFIG_CPU_32v5)               =-D__LINUX_ARM_ARCH__=5 -march=armv5te
  arch-$(CONFIG_CPU_32v4T)      =-D__LINUX_ARM_ARCH__=4 -march=armv4t
  arch-$(CONFIG_CPU_32v4)               =-D__LINUX_ARM_ARCH__=4 -march=armv4
  arch-$(CONFIG_CPU_32v3)               =-D__LINUX_ARM_ARCH__=3 -march=armv3m
@@@ -82,7 -82,7 +82,7 @@@ tune-$(CONFIG_CPU_ARM720T)    =-mtune=arm7
  tune-$(CONFIG_CPU_ARM740T)    =-mtune=arm7tdmi
  tune-$(CONFIG_CPU_ARM9TDMI)   =-mtune=arm9tdmi
  tune-$(CONFIG_CPU_ARM940T)    =-mtune=arm9tdmi
- tune-$(CONFIG_CPU_ARM946E)    =$(call cc-option,-mtune=arm9e,-mtune=arm9tdmi)
+ tune-$(CONFIG_CPU_ARM946E)    =-mtune=arm9e
  tune-$(CONFIG_CPU_ARM920T)    =-mtune=arm9tdmi
  tune-$(CONFIG_CPU_ARM922T)    =-mtune=arm9tdmi
  tune-$(CONFIG_CPU_ARM925T)    =-mtune=arm9tdmi
@@@ -90,11 -90,11 +90,11 @@@ tune-$(CONFIG_CPU_ARM926T) =-mtune=arm9
  tune-$(CONFIG_CPU_FA526)      =-mtune=arm9tdmi
  tune-$(CONFIG_CPU_SA110)      =-mtune=strongarm110
  tune-$(CONFIG_CPU_SA1100)     =-mtune=strongarm1100
- tune-$(CONFIG_CPU_XSCALE)     =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
- tune-$(CONFIG_CPU_XSC3)               =$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
- tune-$(CONFIG_CPU_FEROCEON)   =$(call cc-option,-mtune=marvell-f,-mtune=xscale)
- tune-$(CONFIG_CPU_V6)         =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
- tune-$(CONFIG_CPU_V6K)                =$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
+ tune-$(CONFIG_CPU_XSCALE)     =-mtune=xscale
+ tune-$(CONFIG_CPU_XSC3)               =-mtune=xscale
+ tune-$(CONFIG_CPU_FEROCEON)   =-mtune=xscale
+ tune-$(CONFIG_CPU_V6)         =-mtune=arm1136j-s
+ tune-$(CONFIG_CPU_V6K)                =-mtune=arm1136j-s
  
  # Evaluate tune cc-option calls now
  tune-y := $(tune-y)
@@@ -113,10 -113,6 +113,10 @@@ ifeq ($(CONFIG_CC_IS_CLANG),y
  CFLAGS_ABI    += -meabi gnu
  endif
  
 +ifeq ($(CONFIG_CURRENT_POINTER_IN_TPIDRURO),y)
 +CFLAGS_ABI    += -mtp=cp15
 +endif
 +
  # Accept old syntax despite ".syntax unified"
  AFLAGS_NOWARN :=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)
  
@@@ -277,8 -273,11 +277,8 @@@ ifeq ($(CONFIG_STACKPROTECTOR_PER_TASK)
  prepare: stack_protector_prepare
  stack_protector_prepare: prepare0
        $(eval SSP_PLUGIN_CFLAGS := \
 -              -fplugin-arg-arm_ssp_per_task_plugin-tso=$(shell        \
 -                      awk '{if ($$2 == "THREAD_SZ_ORDER") print $$3;}'\
 -                              include/generated/asm-offsets.h)        \
                -fplugin-arg-arm_ssp_per_task_plugin-offset=$(shell     \
 -                      awk '{if ($$2 == "TI_STACK_CANARY") print $$3;}'\
 +                      awk '{if ($$2 == "TSK_STACK_CANARY") print $$3;}'\
                                include/generated/asm-offsets.h))
        $(eval KBUILD_CFLAGS += $(SSP_PLUGIN_CFLAGS))
        $(eval GCC_PLUGINS_CFLAGS += $(SSP_PLUGIN_CFLAGS))
@@@ -318,6 -317,10 +318,6 @@@ ifeq ($(CONFIG_VDSO),y
        $(Q)$(MAKE) $(build)=arch/arm/vdso $@
  endif
  
 -# We use MRPROPER_FILES and CLEAN_FILES now
 -archclean:
 -      $(Q)$(MAKE) $(clean)=$(boot)
 -
  # My testing targets (bypasses dependencies)
  bp:;  $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage