• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · de06dbfa
    Linus Torvalds authored
    Pull ARM updates from Russell King:
     "Another mixture of changes this time around:
    
       - Split XIP linker file from main linker file to make it more
         maintainable, and various XIP fixes, and clean up a resulting
         macro.
    
       - Decompressor cleanups from Masahiro Yamada
    
       - Avoid printing an error for a missing L2 cache
    
       - Remove some duplicated symbols in System.map, and move
         vectors/stubs back into kernel VMA
    
       - Various low priority fixes from Arnd
    
       - Updates to allow bus match functions to return negative errno
         values, touching some drivers and the driver core.  Greg has acked
         these changes.
    
       - Virtualisation platform udpates form Jean-Philippe Brucker.
    
       - Security enhancements from Kees Cook
    
       - Rework some Kconfig dependencies and move PSCI idle management code
         out of arch/arm into drivers/firmware/psci.c
    
       - ARM DMA mapping updates, touching media, acked by Mauro.
    
       - Fix places in ARM code which should be using virt_to_idmap() so
         that Keystone2 can work.
    
       - Fix Marvell Tauros2 to work again with non-DT boots.
    
       - Provide a delay timer for ARM Orion platforms"
    
    * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (45 commits)
      ARM: 8546/1: dma-mapping: refactor to fix coherent+cma+gfp=0
      ARM: 8547/1: dma-mapping: store buffer information
      ARM: 8543/1: decompressor: rename suffix_y to compress-y
      ARM: 8542/1: decompressor: merge piggy.*.S and simplify Makefile
      ARM: 8541/1: decompressor: drop redundant FORCE in Makefile
      ARM: 8540/1: decompressor: use clean-files instead of extra-y to clean files
      ARM: 8539/1: decompressor: drop more unneeded assignments to "targets"
      ARM: 8538/1: decompressor: drop unneeded assignments to "targets"
      ARM: 8532/1: uncompress: mark putc as inline
      ARM: 8531/1: turn init_new_context into an inline function
      ARM: 8530/1: remove VIRT_TO_BUS
      ARM: 8537/1: drop unused DEBUG_RODATA from XIP_KERNEL
      ARM: 8536/1: mm: hide __start_rodata_section_aligned for non-debug builds
      ARM: 8535/1: mm: DEBUG_RODATA makes no sense with XIP_KERNEL
      ARM: 8534/1: virt: fix hyp-stub build for pre-ARMv7 CPUs
      ARM: make the physical-relative calculation more obvious
      ARM: 8512/1: proc-v7.S: Adjust stack address when XIP_KERNEL
      ARM: 8411/1: Add default SPARSEMEM settings
      ARM: 8503/1: clk_register_clkdev: remove format string interface
      ARM: 8529/1: remove 'i' and 'zi' targets
      ...
    de06dbfa
bus.c 19.3 KB