1. 07 6月, 2014 28 次提交
  2. 06 6月, 2014 3 次提交
    • L
      Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into next · 2b03adc1
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into next · eb3d3ec5
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'arm64-efi-for-linus' of... · c3c55a07
      Linus Torvalds 提交于
      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
  3. 05 6月, 2014 9 次提交
    • L
      Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · 046f1533
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'x86/vdso' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · a0abcf2e
      Linus Torvalds 提交于
      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
    • L
      Merge branch 'x86/espfix' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · 2071b3e3
      Linus Torvalds 提交于
      Pull x86-64 espfix changes from Peter Anvin:
       "This is the espfix64 code, which fixes the IRET information leak as
        well as the associated functionality problem.  With this code applied,
        16-bit stack segments finally work as intended even on a 64-bit
        kernel.
      
        Consequently, this patchset also removes the runtime option that we
        added as an interim measure.
      
        To help the people working on Linux kernels for very small systems,
        this patchset also makes these compile-time configurable features"
      
      * 'x86/espfix' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Revert "x86-64, modify_ldt: Make support for 16-bit segments a runtime option"
        x86, espfix: Make it possible to disable 16-bit support
        x86, espfix: Make espfix64 a Kconfig option, fix UML
        x86, espfix: Fix broken header guard
        x86, espfix: Move espfix definitions into a separate header file
        x86-32, espfix: Remove filter for espfix32 due to race
        x86-64, espfix: Don't leak bits 31:16 of %esp returning to 16-bit stack
      2071b3e3
    • L
      Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next · 9df0fe64
      Linus Torvalds 提交于
      Pull x86 x32 ABI fix from Peter Anvin:
       "A single fix for the x32 ABI: the io_setup() and io_submit() system
        call need to use the compat stubs"
      
      * 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, x32: Use compat shims for io_{setup,submit}
      9df0fe64
    • R
      Merge branch 'devel-stable' into for-next · bd63ce27
      Russell King 提交于
      bd63ce27
    • R
    • A
      microblaze: Fix typo in head.S s/substract/subtract/ · 225fba21
      Antonio Ospite 提交于
      Signed-off-by: NAntonio Ospite <ao2@ao2.it>
      Cc: Michal Simek <monstr@monstr.eu>
      Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>
      Signed-off-by: NMichal Simek <michal.simek@xilinx.com>
      225fba21
    • L
      Merge branch 'akpm' (patchbomb from Andrew) into next · 00170fdd
      Linus Torvalds 提交于
      Merge misc updates from Andrew Morton:
      
       - a few fixes for 3.16.  Cc'ed to stable so they'll get there somehow.
      
       - various misc fixes and cleanups
      
       - most of the ocfs2 queue.  Review is slow...
      
       - most of MM.  The MM queue is pretty huge this time, but not much in
         the way of feature work.
      
       - some tweaks under kernel/
      
       - printk maintenance work
      
       - updates to lib/
      
       - checkpatch updates
      
       - tweaks to init/
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (276 commits)
        fs/autofs4/dev-ioctl.c: add __init to autofs_dev_ioctl_init
        fs/ncpfs/getopt.c: replace simple_strtoul by kstrtoul
        init/main.c: remove an ifdef
        kthreads: kill CLONE_KERNEL, change kernel_thread(kernel_init) to avoid CLONE_SIGHAND
        init/main.c: add initcall_blacklist kernel parameter
        init/main.c: don't use pr_debug()
        fs/binfmt_flat.c: make old_reloc() static
        fs/binfmt_elf.c: fix bool assignements
        fs/efs: convert printk(KERN_DEBUG to pr_debug
        fs/efs: add pr_fmt / use __func__
        fs/efs: convert printk to pr_foo()
        scripts/checkpatch.pl: device_initcall is not the only __initcall substitute
        checkpatch: check stable email address
        checkpatch: warn on unnecessary void function return statements
        checkpatch: prefer kstrto<foo> to sscanf(buf, "%<lhuidx>", &bar);
        checkpatch: add warning for kmalloc/kzalloc with multiply
        checkpatch: warn on #defines ending in semicolon
        checkpatch: make --strict a default for files in drivers/net and net/
        checkpatch: always warn on missing blank line after variable declaration block
        checkpatch: fix wildcard DT compatible string checking
        ...
      00170fdd
    • F
      fs/autofs4/dev-ioctl.c: add __init to autofs_dev_ioctl_init · 3ff6db32
      Fabian Frederick 提交于
      autofs_dev_ioctl_init is only called by __init init_autofs4_fs
      Signed-off-by: NFabian Frederick <fabf@skynet.be>
      Acked-by: NIan Kent <raven@themaw.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      3ff6db32