1. 29 Apr, 2013 6 commits
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 96a3e8af
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
       "PCI changes for the v3.10 merge window:
      
        PCI device hotplug
         - Remove ACPI PCI subdrivers (Jiang Liu, Myron Stowe)
         - Make acpiphp builtin only, not modular (Jiang Liu)
         - Add acpiphp mutual exclusion (Jiang Liu)
      
        Power management
         - Skip "PME enabled/disabled" messages when not supported (Rafael
           Wysocki)
         - Fix fallback to PCI_D0 (Rafael Wysocki)
      
        Miscellaneous
         - Factor quirk_io_region (Yinghai Lu)
         - Cache MSI capability offsets & cleanup (Gavin Shan, Bjorn Helgaas)
         - Clean up EISA resource initialization and logging (Bjorn Helgaas)
         - Fix prototype warnings (Andy Shevchenko, Bjorn Helgaas)
         - MIPS: Initialize of_node before scanning bus (Gabor Juhos)
         - Fix pcibios_get_phb_of_node() declaration "weak" annotation (Gabor
           Juhos)
         - Add MSI INTX_DISABLE quirks for AR8161/AR8162/etc (Xiong Huang)
         - Fix aer_inject return values (Prarit Bhargava)
         - Remove PME/ACPI dependency (Andrew Murray)
         - Use shared PCI_BUS_NUM() and PCI_DEVID() (Shuah Khan)"
      
      * tag 'pci-v3.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (63 commits)
        vfio-pci: Use cached MSI/MSI-X capabilities
        vfio-pci: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
        PCI: Remove "extern" from function declarations
        PCI: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
        PCI: Drop msi_mask_reg() and remove drivers/pci/msi.h
        PCI: Use msix_table_size() directly, drop multi_msix_capable()
        PCI: Drop msix_table_offset_reg() and msix_pba_offset_reg() macros
        PCI: Drop is_64bit_address() and is_mask_bit_support() macros
        PCI: Drop msi_data_reg() macro
        PCI: Drop msi_lower_address_reg() and msi_upper_address_reg() macros
        PCI: Drop msi_control_reg() macro and use PCI_MSI_FLAGS directly
        PCI: Use cached MSI/MSI-X offsets from dev, not from msi_desc
        PCI: Clean up MSI/MSI-X capability #defines
        PCI: Use cached MSI-X cap while enabling MSI-X
        PCI: Use cached MSI cap while enabling MSI interrupts
        PCI: Remove MSI/MSI-X cap check in pci_msi_check_device()
        PCI: Cache MSI/MSI-X capability offsets in struct pci_dev
        PCI: Use u8, not int, for PM capability offset
        [SCSI] megaraid_sas: Use correct #define for MSI-X capability
        PCI: Remove "extern" from function declarations
        ...
      96a3e8af
    • Linus Torvalds's avatar
      Merge tag 'please-pull-misc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux · a8745105
      Linus Torvalds authored
      Pull ia64 fixes from Tony Luck:
       "Bundle of miscellaneous ia64 fixes for 3.10 merge window."
      
      * tag 'please-pull-misc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
        Add size restriction to the kdump documentation
        Fix example error_injection_tool
        Fix build error for numa_clear_node() under IA64
        Fix initialization of CMCI/CMCP interrupts
        Change "select DMAR" to "select INTEL_IOMMU"
        Wrong asm register contraints in the kvm implementation
        Wrong asm register contraints in the futex implementation
        Remove cast for kmalloc return value
        Fix kexec oops when iosapic was removed
        iosapic: fix a minor typo in comments
        Add WB/UC check for early_ioremap
        Fix broken fsys_getppid()
        tiocx: check retval from bus_register()
      a8745105
    • Linus Torvalds's avatar
      Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 916bb6d7
      Linus Torvalds authored
      Pull locking changes from Ingo Molnar:
       "The most noticeable change are mutex speedups from Waiman Long, for
        higher loads.  These scalability changes should be most noticeable on
        larger server systems.
      
        There are also cleanups, fixes and debuggability improvements."
      
      * 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        lockdep: Consolidate bug messages into a single print_lockdep_off() function
        lockdep: Print out additional debugging advice when we hit lockdep BUGs
        mutex: Back out architecture specific check for negative mutex count
        mutex: Queue mutex spinners with MCS lock to reduce cacheline contention
        mutex: Make more scalable by doing less atomic operations
        mutex: Move mutex spinning code from sched/core.c back to mutex.c
        locking/rtmutex/tester: Set correct permissions on sysfs files
        lockdep: Remove unnecessary 'hlock_next' variable
      916bb6d7
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · d0b88838
      Linus Torvalds authored
      Pull s390 update from Martin Schwidefsky:
       "This is the first batch of s390 patches for the 3.10 merge window.
      
        Included are some performance enhancements: storage key
        initialization, zero page cache synonyms, system call micro
        optimization and the speedup patches for dasdfmt.  Sebastian managed
        to get rid of the special casing for the console device in the cio
        layer.  And the usual bunch of bug fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (59 commits)
        s390/pci: use pci_scan_root_bus
        s390/scm_blk: fix memleak in init function
        s390/scm_blk: allow more cluster size values
        s390/cio: fix irq statistics
        s390/memory hotplug: prevent offline of active memory increments
        s390: remove small stack config option
        s390: system call path micro optimization
        s390: lowcore stack pointer offsets
        s390/uapi: change struct statfs[64] member types to unsigned values
        s390/pci: return correct dma address for offset > PAGE_SIZE
        s390/ptrace: remove empty ifdefs
        s390/compat: remove ptrace compat definitions from uapi header file
        s390/compat: fix compile error for !COMPAT
        s390/compat: fix compat_sys_statfs() memory corruption
        s390/zcore: Fix HSA copy length for last block
        s390/mm,gmap: segment mapping race
        s390/mm,gmap: implement gmap_translate()
        s390/pci: remove disable_device implementation
        s390/pci: disable per default
        s390/pci: return error after failed pci ops
        ...
      d0b88838
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.10-rc0-tag' of... · 9d2da7af
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.10-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      Pull Xen updates from Konrad Rzeszutek Wilk:
       "Features:
         - Populate the boot_params with EDD data.
         - Cleanups in the IRQ code.
        Bug-fixes:
         - CPU hotplug offline/online in PVHVM mode.
         - Re-upload processor PM data after ACPI S3 suspend/resume cycle."
      
      And Konrad gets a gold star for sending the pull request early when he
      thought he'd be away for the first week of the merge window (but because
      of 3.9 dragging out to -rc8 he then re-sent the reminder on the first
      day of the merge window anyway)
      
      * tag 'stable/for-linus-3.10-rc0-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen: resolve section mismatch warnings in xen-acpi-processor
        xen: Re-upload processor PM data to hypervisor after S3 resume (v2)
        xen/smp: Unifiy some of the PVs and PVHVM offline CPU path
        xen/smp/pvhvm: Don't initialize IRQ_WORKER as we are using the native one.
        xen/spinlock: Disable IRQ spinlock (PV) allocation on PVHVM
        xen/spinlock:  Check against default value of -1 for IRQ line.
        xen/time: Add default value of -1 for IRQ and check for that.
        xen/events: Check that IRQ value passed in is valid.
        xen/time: Fix kasprintf splat when allocating timer%d IRQ line.
        xen/smp/spinlock: Fix leakage of the spinlock interrupt line for every CPU online/offline
        xen/smp: Fix leakage of timer interrupt line for every CPU online/offline.
        xen kconfig: fix select INPUT_XEN_KBDDEV_FRONTEND
        xen: drop tracking of IRQ vector
        x86/xen: populate boot_params with EDD data
      9d2da7af
    • Linus Torvalds's avatar
      Linux 3.9 · c1be5a5b
      Linus Torvalds authored
      c1be5a5b
  2. 27 Apr, 2013 4 commits
  3. 26 Apr, 2013 15 commits
  4. 25 Apr, 2013 8 commits
    • H. Peter Anvin's avatar
      Merge tag 'efi-urgent' into x86/urgent · 697dfd88
      H. Peter Anvin authored
       * The EFI variable anti-bricking algorithm merged in -rc8 broke booting
         on some Apple machines because they implement EFI spec 1.10, which
         doesn't provide a QueryVariableInfo() runtime function and the logic
         used to check for the existence of that function was insufficient.
         Fix from Josh Boyer.
      
       * The anti-bricking algorithm also introduced a compiler warning on
         32-bit. Fix from Borislav Petkov.
      Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
      697dfd88
    • John David Anglin's avatar
      parisc: use spin_lock_irqsave/spin_unlock_irqrestore for PTE updates · bda079d3
      John David Anglin authored
      User applications running on SMP kernels have long suffered from instability
      and random segmentation faults.  This patch improves the situation although
      there is more work to be done.
      
      One of the problems is the various routines in pgtable.h that update page table
      entries use different locking mechanisms, or no lock at all (set_pte_at).  This
      change modifies the routines to all use the same lock pa_dbit_lock.  This lock
      is used for dirty bit updates in the interruption code. The patch also purges
      the TLB entries associated with the PTE to ensure that inconsistent values are
      not used after the page table entry is updated.  The UP and SMP code are now
      identical.
      
      The change also includes a minor update to the purge_tlb_entries function in
      cache.c to improve its efficiency.
      Signed-off-by: default avatarJohn David Anglin <dave.anglin@bell.net>
      Cc: Helge Deller <deller@gmx.de>
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      bda079d3
    • Helge Deller's avatar
      parisc: disable -mlong-calls compiler option for kernel modules · cf71130d
      Helge Deller authored
      CONFIG_MLONGCALLS was introduced in commit
      ec758f98 to overcome linker issues when linking
      huge linux kernels, e.g. with many modules linked in.
      
      But in the kernel module loader there is no support yet for the new relocation
      types, which is why modules built with -mlong-calls can't be loaded.
      Furthermore, for modules long calls are not really necessary, since we already
      use stub sections which resolve long distance calls.
      
      So, let's just disable this compiler option when compiling kernel modules.
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      cf71130d
    • Will Deacon's avatar
      parisc: uaccess: fix compiler warnings caused by __put_user casting · 0f28b628
      Will Deacon authored
      When targetting 32-bit processors, __put_user emits a pair of stw
      instructions for the 8-byte case. If the type of __val is a pointer, the
      marshalling code casts it to the wider integer type of u64, resulting
      in the following compiler warnings:
      
        kernel/signal.c: In function 'copy_siginfo_to_user':
        kernel/signal.c:2752:11: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
        kernel/signal.c:2752:11: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
        [...]
      
      This patch fixes the warnings by removing the marshalling code and using
      the correct output modifiers in the __put_{user,kernel}_asm64 macros
      so that GCC will allocate the right registers without the need to
      extract the two words explicitly.
      
      Cc: Helge Deller <deller@gmx.de>
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      0f28b628
    • John David Anglin's avatar
      parisc: Change kunmap macro to static inline function · 87be2f88
      John David Anglin authored
      Change kunmap macro to static inline function to fix build error
      compiling drivers/base/dma-buf.c.
      
      Without the change, the following error can occur:
      
         CC      drivers/base/dma-buf.o
      drivers/base/dma-buf.c: In function 'dma_buf_kunmap':
      drivers/base/dma-buf.c:427:46:
      error: macro "kunmap" passed 3 arguments, but takes just 1
      
      I believe parisc is the only arch to implement kunmap using a macro.
      Signed-off-by: default avatarJohn David Anglin <dave.anglin@bell.net>
      Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
      Cc: Helge Deller <deller@gmx.de>
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      87be2f88
    • John David Anglin's avatar
      parisc: Provide __ucmpdi2 to resolve undefined references in 32 bit builds. · ca0ad83d
      John David Anglin authored
      The Debian experimental linux source package (3.8.5-1) build fails
      with the following errors:
      ...
      MODPOST 2016 modules
      ERROR: "__ucmpdi2" [fs/btrfs/btrfs.ko] undefined!
      ERROR: "__ucmpdi2" [drivers/md/dm-verity.ko] undefined!
      
      The attached patch resolves this problem.  It is based on the s390
      implementation of ucmpdi2.c.
      Signed-off-by: default avatarJohn David Anglin <dave.anglin@bell.net>
      Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      ca0ad83d
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc · 0fbd0676
      Linus Torvalds authored
      Pull sparc fix from David Miller:
       "Brown paper bag fix for sparc64"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
        sparc64: Fix missing put_cpu_var() in tlb_batch_add_one() when not batching.
      0fbd0676
    • Linus Torvalds's avatar
      Merge tag 'gpio-v3.9-lastminute' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 3c71d03a
      Linus Torvalds authored
      Pull gpi fix from Linus Walleij:
       "This is a last minute revert for the GPIO tree, as Mike Dunn noticed
        breakage on some older PXA machines due to moving PXA GPIO initcalls
        to the module_init initlevel"
      
      * tag 'gpio-v3.9-lastminute' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        Revert "gpio: pxa: set initcall level to module init"
      3c71d03a
  5. 24 Apr, 2013 7 commits