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

Pull ARM updates from Russell King:

 - add arch/arm/Kbuild from Masahiro Yamada.

 - simplify act_mm macro, since it contains an open-coded
   get_thread_info.

 - VFP updates for Clang from Stefan Agner.

 - Fix unwinder for Clang from Nathan Huckleberry.

 - Remove unused it8152 PCI host controller, used by the removed cm-x2xx
   platforms from Mike Rapoport.

 - Further explanation of __range_ok().

 - Remove kimage_voffset that isn't used anymore from Marc Zyngier.

 - Drop ancient Thumb-2 workaround for old binutils from Ard Biesheuvel.

 - Documentation cleanup for mach-* from Pete Zaitcev.

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8996/1: Documentation/Clean up the description of mach-<class>
  ARM: 8995/1: drop Thumb-2 workaround for ancient binutils
  ARM: 8994/1: mm: drop kimage_voffset which was only used by KVM
  ARM: uaccess: add further explanation of __range_ok()
  ARM: 8993/1: remove it8152 PCI controller driver
  ARM: 8992/1: Fix unwind_frame for clang-built kernels
  ARM: 8991/1: use VFP assembler mnemonics if available
  ARM: 8990/1: use VFP assembler mnemonics in register load/store macros
  ARM: 8989/1: use .fpu assembler directives instead of assembler arguments
  ARM: 8982/1: mm: Simplify act_mm macro
  ARM: 8981/1: add arch/arm/Kbuild

diff --combined arch/arm/Kconfig
index 218bf25b369aa1c5014d2c007bea456f1016d131,1b65ff94ad1cd3d7e78fcf9a38ea9328a7f786d7..e00d94b1665876594ca693593aa7231f83cf84e5
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -41,7 -41,6 +41,7 @@@ config AR
        select CPU_PM if SUSPEND || CPU_IDLE
        select DCACHE_WORD_ACCESS if HAVE_EFFICIENT_UNALIGNED_ACCESS
        select DMA_DECLARE_COHERENT
 +      select DMA_OPS
        select DMA_REMAP if MMU
        select EDAC_SUPPORT
        select EDAC_ATOMIC_SCRUB
@@@ -73,6 -72,7 +73,6 @@@
        select HAVE_ARM_SMCCC if CPU_V7
        select HAVE_EBPF_JIT if !CPU_ENDIAN_BE32
        select HAVE_CONTEXT_TRACKING
 -      select HAVE_COPY_THREAD_TLS
        select HAVE_C_RECORDMCOUNT
        select HAVE_DEBUG_KMEMLEAK if !XIP_KERNEL
        select HAVE_DMA_CONTIGUOUS if MMU
@@@ -668,8 -668,6 +668,8 @@@ source "arch/arm/mach-mmp/Kconfig
  
  source "arch/arm/mach-moxart/Kconfig"
  
 +source "arch/arm/mach-mstar/Kconfig"
 +
  source "arch/arm/mach-mv78xx0/Kconfig"
  
  source "arch/arm/mach-mvebu/Kconfig"
@@@ -1150,12 -1148,6 +1150,6 @@@ config PCI_NANOENGIN
        help
          Enable PCI on the BSE nanoEngine board.
  
- config PCI_HOST_ITE8152
-       bool
-       depends on PCI && MACH_ARMCORE
-       default y
-       select DMABOUNCE
- 
  config ARM_ERRATA_814220
        bool "ARM errata: Cache maintenance by set/way operations can execute out of order"
        depends on CPU_V7
@@@ -1430,37 -1422,6 +1424,6 @@@ config THUMB2_KERNE
  
          If unsure, say N.
  
- config THUMB2_AVOID_R_ARM_THM_JUMP11
-       bool "Work around buggy Thumb-2 short branch relocations in gas"
-       depends on THUMB2_KERNEL && MODULES
-       default y
-       help
-         Various binutils versions can resolve Thumb-2 branches to
-         locally-defined, preemptible global symbols as short-range "b.n"
-         branch instructions.
- 
-         This is a problem, because there's no guarantee the final
-         destination of the symbol, or any candidate locations for a
-         trampoline, are within range of the branch.  For this reason, the
-         kernel does not support fixing up the R_ARM_THM_JUMP11 (102)
-         relocation in modules at all, and it makes little sense to add
-         support.
- 
-         The symptom is that the kernel fails with an "unsupported
-         relocation" error when loading some modules.
- 
-         Until fixed tools are available, passing
-         -fno-optimize-sibling-calls to gcc should prevent gcc generating
-         code which hits this problem, at the cost of a bit of extra runtime
-         stack usage in some cases.
- 
-         The problem is described in more detail at:
-             https://bugs.launchpad.net/binutils-linaro/+bug/725126
- 
-         Only Thumb-2 kernels are affected.
- 
-         Unless you are sure your tools don't have this problem, say Y.
- 
  config ARM_PATCH_IDIV
        bool "Runtime patch udiv/sdiv instructions into __aeabi_{u}idiv()"
        depends on CPU_32v7 && !XIP_KERNEL
@@@ -2099,3 -2060,5 +2062,5 @@@ source "drivers/firmware/Kconfig
  if CRYPTO
  source "arch/arm/crypto/Kconfig"
  endif
+ 
+ source "arch/arm/Kconfig.assembler"

diff --combined arch/arm/Makefile
index e7f4ca060c0fca8e892f99109bee81b3b67caf0e,f0ef23865df7fc03b83d0b1b78804f1bbabf6ab4..4e877354515f4b77200c083c5db018d02dfa46b3
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -123,10 -123,6 +123,6 @@@ AFLAGS_NOWARN     :=$(call as-option,-Wa$(c
  ifeq ($(CONFIG_THUMB2_KERNEL),y)
  CFLAGS_ISA    :=-mthumb -Wa,-mimplicit-it=always $(AFLAGS_NOWARN)
  AFLAGS_ISA    :=$(CFLAGS_ISA) -Wa$(comma)-mthumb
- # Work around buggy relocation from gas if requested:
- ifeq ($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y)
- KBUILD_CFLAGS_MODULE  +=-fno-optimize-sibling-calls
- endif
  else
  CFLAGS_ISA    :=$(call cc-option,-marm,) $(AFLAGS_NOWARN)
  AFLAGS_ISA    :=$(CFLAGS_ISA)
@@@ -197,7 -193,6 +193,7 @@@ machine-$(CONFIG_ARCH_MXC)         += im
  machine-$(CONFIG_ARCH_MEDIATEK)               += mediatek
  machine-$(CONFIG_ARCH_MILBEAUT)               += milbeaut
  machine-$(CONFIG_ARCH_MXS)            += mxs
 +machine-$(CONFIG_ARCH_MSTARV7)                += mstar
  machine-$(CONFIG_ARCH_NOMADIK)                += nomadik
  machine-$(CONFIG_ARCH_NPCM)           += npcm
  machine-$(CONFIG_ARCH_NSPIRE)         += nspire
@@@ -276,18 -271,8 +272,8 @@@ endi
  
  export        TEXT_OFFSET GZFLAGS MMUEXT
  
- core-$(CONFIG_FPE_NWFPE)      += arch/arm/nwfpe/
- # Put arch/arm/fastfpe/ to use this.
- core-$(CONFIG_FPE_FASTFPE)    += $(patsubst $(srctree)/%,%,$(wildcard $(srctree)/arch/arm/fastfpe/))
- core-$(CONFIG_VFP)            += arch/arm/vfp/
- core-$(CONFIG_XEN)            += arch/arm/xen/
- core-$(CONFIG_VDSO)           += arch/arm/vdso/
- 
+ core-y                                += arch/arm/
  # If we have a machine-specific directory, then include it in the build.
- core-y                                += arch/arm/kernel/ arch/arm/mm/ arch/arm/common/
- core-y                                += arch/arm/probes/
- core-y                                += arch/arm/net/
- core-y                                += arch/arm/crypto/
  core-y                                += $(machdirs) $(platdirs)
  
  # For cleaning

diff --combined arch/arm/mm/mmu.c
index bcd82614c25d0c45f7efe69674e6a95fd0aaa4ea,6acbd59186761d36dd077af77d14d7a6a5cdbcee..cc3c9a6a111307ac0edf1c3c7c0d46bbfa368651
--- 1/arch/arm/mm/mmu.c
--- 2/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@@ -74,8 -74,6 +74,6 @@@ struct cachepolicy 
        pteval_t        pte;
  };
  
- unsigned long kimage_voffset __ro_after_init;
- 
  static struct cachepolicy cache_policies[] __initdata = {
        {
                .policy         = "uncached",
@@@ -966,7 -964,7 +964,7 @@@ void __init create_mapping_late(struct 
        pud_t *pud;
  
        p4d = p4d_alloc(mm, pgd_offset(mm, md->virtual), md->virtual);
 -      if (!WARN_ON(!p4d))
 +      if (WARN_ON(!p4d))
                return;
        pud = pud_alloc(mm, p4d, md->virtual);
        if (WARN_ON(!pud))
@@@ -1654,9 -1652,6 +1652,6 @@@ void __init paging_init(const struct ma
  
        empty_zero_page = virt_to_page(zero_page);
        __flush_dcache_page(NULL, empty_zero_page);
- 
-       /* Compute the virt/idmap offset, mostly for the sake of KVM */
-       kimage_voffset = (unsigned long)&kimage_voffset - virt_to_idmap(&kimage_voffset);
  }
  
  void __init early_mm_init(const struct machine_desc *mdesc)