1. 06 Jun, 2014 35 commits
  2. 05 Jun, 2014 5 commits
    • Linus Torvalds's avatar
      Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into next · 2b03adc1
      Linus Torvalds authored
      Pull Microblaze updates from Michal Simek:
       - cleanup PCI and DMA handling
       - use generic device.h
       - some cleanups
      
      * tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Fix typo in head.S s/substract/subtract/
        microblaze: remove check for CONFIG_XILINX_CONSOLE
        microblaze: Use generic device.h
        microblaze: Do not setup empty unmap_sg function
        microblaze: Remove device_to_mask
        microblaze: Clean device dma_ops structure
        microblaze: Cleanup PCI_DRAM_OFFSET handling
        microblaze: Do not setup pci_dma_ops
        microblaze: Return default dma operations
        microblaze: Enable SERIAL_OF_PLATFORM
      2b03adc1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next · eb3d3ec5
      Linus Torvalds authored
      Pull ARM updates from Russell King:
      
       - Major clean-up of the L2 cache support code.  The existing mess was
         becoming rather unmaintainable through all the additions that others
         have done over time.  This turns it into a much nicer structure, and
         implements a few performance improvements as well.
      
       - Clean up some of the CP15 control register tweaks for alignment
         support, moving some code and data into alignment.c
      
       - DMA properties for ARM, from Santosh and reviewed by DT people.  This
         adds DT properties to specify bus translations we can't discover
         automatically, and to indicate whether devices are coherent.
      
       - Hibernation support for ARM
      
       - Make ftrace work with read-only text in modules
      
       - add suspend support for PJ4B CPUs
      
       - rework interrupt masking for undefined instruction handling, which
         allows us to enable interrupts earlier in the handling of these
         exceptions.
      
       - support for big endian page tables
      
       - fix stacktrace support to exclude stacktrace functions from the
         trace, and add save_stack_trace_regs() implementation so that kprobes
         can record stack traces.
      
       - Add support for the Cortex-A17 CPU.
      
       - Remove last vestiges of ARM710 support.
      
       - Removal of ARM "meminfo" structure, finally converting us solely to
         memblock to handle the early memory initialisation.
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (142 commits)
        ARM: ensure C page table setup code follows assembly code (part II)
        ARM: ensure C page table setup code follows assembly code
        ARM: consolidate last remaining open-coded alignment trap enable
        ARM: remove global cr_no_alignment
        ARM: remove CPU_CP15 conditional from alignment.c
        ARM: remove unused adjust_cr() function
        ARM: move "noalign" command line option to alignment.c
        ARM: provide common method to clear bits in CPU control register
        ARM: 8025/1: Get rid of meminfo
        ARM: 8060/1: mm: allow sub-architectures to override PCI I/O memory type
        ARM: 8066/1: correction for ARM patch 8031/2
        ARM: 8049/1: ftrace/add save_stack_trace_regs() implementation
        ARM: 8065/1: remove last use of CONFIG_CPU_ARM710
        ARM: 8062/1: Modify ldrt fixup handler to re-execute the userspace instruction
        ARM: 8047/1: rwsem: use asm-generic rwsem implementation
        ARM: l2c: trial at enabling some Cortex-A9 optimisations
        ARM: l2c: add warnings for stuff modifying aux_ctrl register values
        ARM: l2c: print a warning with L2C-310 caches if the cache size is modified
        ARM: l2c: remove old .set_debug method
        ARM: l2c: kill L2X0_AUX_CTRL_MASK before anyone else makes use of this
        ...
      eb3d3ec5
    • Linus Torvalds's avatar
      Merge branch 'arm64-efi-for-linus' of... · c3c55a07
      Linus Torvalds authored
      Merge branch 'arm64-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
      
      Pull ARM64 EFI update from Peter Anvin:
       "By agreement with the ARM64 EFI maintainers, we have agreed to make
        -tip the upstream for all EFI patches.  That is why this patchset
        comes from me :)
      
        This patchset enables EFI stub support for ARM64, like we already have
        on x86"
      
      * 'arm64-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        arm64: efi: only attempt efi map setup if booting via EFI
        efi/arm64: ignore dtb= when UEFI SecureBoot is enabled
        doc: arm64: add description of EFI stub support
        arm64: efi: add EFI stub
        doc: arm: add UEFI support documentation
        arm64: add EFI runtime services
        efi: Add shared FDT related functions for ARM/ARM64
        arm64: Add function to create identity mappings
        efi: add helper function to get UEFI params from FDT
        doc: efi-stub.txt updates for ARM
        lib: add fdt_empty_tree.c
      c3c55a07
    • Linus Torvalds's avatar
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · 046f1533
      Linus Torvalds authored
      Pull x86 EFI updates from Peter Anvin:
       "A collection of EFI changes.  The perhaps most important one is to
        fully save and restore the FPU state around each invocation of EFI
        runtime, and to not choke on non-ASCII characters in the boot stub"
      
      * 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        efivars: Add compatibility code for compat tasks
        efivars: Refactor sanity checking code into separate function
        efivars: Stop passing a struct argument to efivar_validate()
        efivars: Check size of user object
        efivars: Use local variables instead of a pointer dereference
        x86/efi: Save and restore FPU context around efi_calls (i386)
        x86/efi: Save and restore FPU context around efi_calls (x86_64)
        x86/efi: Implement a __efi_call_virt macro
        x86, fpu: Extend the use of static_cpu_has_safe
        x86/efi: Delete most of the efi_call* macros
        efi: x86: Handle arbitrary Unicode characters
        efi: Add get_dram_base() helper function
        efi: Add shared printk wrapper for consistent prefixing
        efi: create memory map iteration helper
        efi: efi-stub-helper cleanup
      046f1533
    • Linus Torvalds's avatar
      Merge branch 'x86/vdso' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · a0abcf2e
      Linus Torvalds authored
      Pull x86 cdso updates from Peter Anvin:
       "Vdso cleanups and improvements largely from Andy Lutomirski.  This
        makes the vdso a lot less ''special''"
      
      * 'x86/vdso' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/vdso, build: Make LE access macros clearer, host-safe
        x86/vdso, build: Fix cross-compilation from big-endian architectures
        x86/vdso, build: When vdso2c fails, unlink the output
        x86, vdso: Fix an OOPS accessing the HPET mapping w/o an HPET
        x86, mm: Replace arch_vma_name with vm_ops->name for vsyscalls
        x86, mm: Improve _install_special_mapping and fix x86 vdso naming
        mm, fs: Add vm_ops->name as an alternative to arch_vma_name
        x86, vdso: Fix an OOPS accessing the HPET mapping w/o an HPET
        x86, vdso: Remove vestiges of VDSO_PRELINK and some outdated comments
        x86, vdso: Move the vvar and hpet mappings next to the 64-bit vDSO
        x86, vdso: Move the 32-bit vdso special pages after the text
        x86, vdso: Reimplement vdso.so preparation in build-time C
        x86, vdso: Move syscall and sysenter setup into kernel/cpu/common.c
        x86, vdso: Clean up 32-bit vs 64-bit vdso params
        x86, mm: Ensure correct alignment of the fixmap
      a0abcf2e