1. 18 Jul, 2014 2 commits
    • Steven Whitehouse's avatar
      GFS2: Fix race in glock lru glock disposal · 94a09a39
      Steven Whitehouse authored
      We must not leave items on the LRU list with GLF_LOCK set, since
      they can be removed if the glock is brought back into use, which
      may then potentially result in a hang, waiting for GLF_LOCK to
      clear.
      
      It doesn't happen very often, since it requires a glock that has
      not been used for a long time to be brought back into use at the
      same moment that the shrinker is part way through disposing of
      glocks.
      
      The fix is to set GLF_LOCK at a later time, when we already know
      that the other locks can be obtained. Also, we now only release
      the lru_lock in case a resched is needed, rather than on every
      iteration.
      Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
      94a09a39
    • Bob Peterson's avatar
      GFS2: Only wait for demote when last holder is dequeued · 79272b35
      Bob Peterson authored
      Function gfs2_glock_dq_wait is supposed to dequeue a glock and then
      wait for the lock to be demoted. The problem is, if this is a shared
      lock, its demote will depend on the other holders, which means you
      might end up waiting forever because the other process is blocked.
      This problem is especially apparent when dealing with nested flocks.
      Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
      Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
      79272b35
  2. 19 Jun, 2014 12 commits
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 3c8fb504
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
       "These are fixes mostly (ia64 regression related to the ACPI
        enumeration of devices, cpufreq regressions, fix for I2C controllers
        included in Intel SoCs, mvebu cpuidle driver fix related to sysfs)
        plus additional kernel command line arguments from Kees to make it
        possible to build kernel images with hibernation and the kernel
        address space randomization included simultaneously, a new ACPI
        battery driver quirk for a system with a broken BIOS and a couple of
        ACPI core cleanups.
      
        Specifics:
      
         - Fix for an ia64 regression introduced during the 3.11 cycle by a
           commit that modified the hardware initialization ordering and made
           device discovery fail on some systems.
      
         - Fix for a build problem on systems where the cpufreq-cpu0 driver is
           built-in and the cpu-thermal driver is modular from Arnd Bergmann.
      
         - Fix for a recently introduced computational mistake in the
           intel_pstate driver that leads to excessive rounding errors from
           Doug Smythies.
      
         - Fix for a failure code path in cpufreq_update_policy() that fails
           to unlock the locks acquired previously from Aaron Plattner.
      
         - Fix for the cpuidle mvebu driver to use shorter state names which
           will prevent the sysfs interface from returning mangled strings.
           From Gregory Clement.
      
         - ACPI LPSS driver fix to make sure that the I2C controllers included
           in BayTrail SoCs are not held in the reset state while they are
           being probed from Mika Westerberg.
      
         - New kernel command line arguments making it possible to build
           kernel images with hibernation and kASLR included at the same time
           and to select which of them will be used via the command line (they
           are still functionally mutually exclusive, though).  From Kees
           Cook.
      
         - ACPI battery driver quirk for Acer Aspire V5-573G that fails to
           send battery status change notifications timely from Alexander
           Mezin.
      
         - Two ACPI core cleanups from Christoph Jaeger and Fabian Frederick"
      
      * tag 'pm+acpi-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        cpuidle: mvebu: Fix the name of the states
        cpufreq: unlock when failing cpufreq_update_policy()
        intel_pstate: Correct rounding in busy calculation
        ACPI: use kstrto*() instead of simple_strto*()
        ACPI / processor replace __attribute__((packed)) by __packed
        ACPI / battery: add quirk for Acer Aspire V5-573G
        ACPI / battery: use callback for setting up quirks
        ACPI / LPSS: Take I2C host controllers out of reset
        x86, kaslr: boot-time selectable with hibernation
        PM / hibernate: introduce "nohibernate" boot parameter
        cpufreq: cpufreq-cpu0: fix CPU_THERMAL dependency
        ACPI / ia64 / sba_iommu: Restore the working initialization ordering
      3c8fb504
    • Linus Torvalds's avatar
      Merge tag 'sound-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 4ef61076
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "The significant part here is a few security fixes for ALSA core
        control API by Lars.  Besides that, there are a few fixes for ASoC
        sigmadsp (again by Lars) for building properly, and small fixes for
        ASoC rsnd, MMP, PXA and FSL, in addition to a fix for bogus WARNING in
        i915/HD-audio binding"
      
      * tag 'sound-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: control: Make sure that id->index does not overflow
        ALSA: control: Handle numid overflow
        ALSA: control: Don't access controls outside of protected regions
        ALSA: control: Fix replacing user controls
        ALSA: control: Protect user controls against concurrent access
        drm/i915, HD-audio: Don't continue probing when nomodeset is given
        ASoC: fsl: Fix build problem
        ASoC: rsnd: fixup index of src/dst mod when capture
        ASoC: fsl_spdif: Fix integer overflow when calculating divisors
        ASoC: fsl_spdif: Fix incorrect usage of regmap_read()
        ASoC: dapm: Make sure register value is in sync with DAPM kcontrol state
        ASoC: sigmadsp: Split regmap and I2C support into separate modules
        ASoC: MMP audio needs sram support
        ASoC: pxa: add I2C dependencies as needed
      4ef61076
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 0c9bc275
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "This looks bigger than it is, as one of the nouveau firmware fixes
        ("drm/gf100-/gr: report class data to host on fwmthd failure")
        regenerates a bunch of the firmware files after changing the assembly
        by a few lines, without that, its more of a
      
          36 files changed, 370 insertions(+), 129 deletions(-)
      
        It contains some vt.c fixes acked by Greg, for rare hard hangs on i915
        loading, that also fixes hangs on reload and spurious register write
        errors.
      
        drm core: one fix for uninit memory
      
        nouveau: displayport rework caused a few regressions, Ben has been
           fixing them as the appear, along with some other fixes
      
        radeon: pageflipping regression fix, deep color fix, mode validation
           fixes
      
        i915: fbc disable, vga console kick off, backlight fix, divide-by-zero
           fix"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (33 commits)
        drm: fix uninitialized acquire_ctx fields (v2)
        drm/radeon: Fix radeon_irq_kms_pflip_irq_get/put() imbalance
        Revert "drm/radeon: remove drm_vblank_get|put from pflip handling"
        drm/radeon: improve dvi_mode_valid
        drm/radeon: update mode_valid testing for DP
        drm/radeon: Use dce5/6 hdmi deep color clock setup also on dce8+
        drm/nouveau/disp: fix oops in destructor with headless cards
        drm/gf117/i2c: no aux channels on this chipset
        drm/nouveau/doc: update the thermal documentation
        drm/nouveau/pwr: fix typo in fifo wrap handling
        drm/nv50/disp: fix a potential oops in supervisor handling
        drm/nouveau/disp/dp: don't touch link config after success
        drm/nouveau/kms: reference vblank for crtc during pageflip.
        drm/gk104/fb/ram: fixups from an earlier search+replace
        drm/nv50/gr: remove an unneeded write while initialising PGRAPH
        drm/nv50/gr: fix overlap while zeroing zcull regions
        drm/gf100-/gr: report class data to host on fwmthd failure
        drm/gk104/ibus: increase various random timeouts
        drm/gk104/clk: only touch divider for mode we'll be using
        drm/radeon: Bypass hw lut's for > 8 bpc framebuffer scanout.
        ...
      0c9bc275
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · f1d70248
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       "A smaller collection of fixes for the block core that would be nice to
        have in -rc2.  This pull request contains:
      
         - Fixes for races in the wait/wakeup logic used in blk-mq from
           Alexander.  No issues have been observed, but it is definitely a
           bit flakey currently.  Alternatively, we may drop the cyclic
           wakeups going forward, but that needs more testing.
      
         - Some cleanups from Christoph.
      
         - Fix for an oops in null_blk if queue_mode=1 and softirq completions
           are used.  From me.
      
         - A fix for a regression caused by the chunk size setting.  It
           inadvertently used max_hw_sectors instead of max_sectors, which is
           incorrect, and causes hangs on btrfs multi-disk setups (where hw
           sectors apparently isn't set).  From me.
      
         - Removal of WQ_POWER_EFFICIENT in the kblockd creation.  This was a
           recent addition as well, but it actually breaks blk-mq which relies
           on strict scheduling.  If the workqueue power_efficient mode is
           turned on, this breaks blk-mq.  From Matias.
      
         - null_blk module parameter description fix from Mike"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        blk-mq: bitmap tag: fix races in bt_get() function
        blk-mq: bitmap tag: fix race on blk_mq_bitmap_tags::wake_cnt
        blk-mq: bitmap tag: fix races on shared ::wake_index fields
        block: blk_max_size_offset() should check ->max_sectors
        null_blk: fix softirq completions for queue_mode == 1
        blk-mq: merge blk_mq_drain_queue and __blk_mq_drain_queue
        blk-mq: properly drain stopped queues
        block: remove WQ_POWER_EFFICIENT from kblockd
        null_blk: fix name and description of 'queue_mode' module parameter
        block: remove elv_abort_queue and blk_abort_flushes
      f1d70248
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 58c72f94
      Linus Torvalds authored
      Pull ARM SoC fixes from Arnd Bergmann:
       "A first set of bug fixes that didn't make it for the merge window, and
        two Kconfig cleanups that still make sense at this point.
      
        Unfortunately, one of the two cleanups caused an unintended change in
        the original version, so we had to revert one part of it and do some
        more testing to ensure the rest is really fine.  There was also a
        last-minute rebase of the patches to remove another bad commit"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: use menuconfig for sub-arch menus
        ARM: multi_v7_defconfig: re-enable SDHCI drivers
        ARM: EXYNOS: Fix compilation warning
        ARM: exynos: move sysram info to exynos.c
        ARM: dts: Specify the NAND ECC scheme explicitly on Armada 385 DB board
        ARM: dts: Specify the NAND ECC scheme explicitly on Armada 375 DB board
        ARM: exynos: cleanup kconfig option display
        misc: vexpress: fix error handling vexpress_syscfg_regmap_init()
        ARM: Remove ARCH_HAS_CPUFREQ config option
        ARM: integrator: fix section mismatch problem
        ARM: mvebu: DT: fix OpenBlocks AX3-4 RAM size
        ARM: samsung: make SAMSUNG_DMADEV optional
        remoteproc: da8xx: don't select CMA on no-MMU
        bus/arm-cci: add dependency on OF && CPU_V7
        ARM: keystone requires ARM_PATCH_PHYS_VIRT
        ARM: omap2: fix am43xx dependency on l2x0 cache
      58c72f94
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 894e552c
      Linus Torvalds authored
      Pull security maintainership update from James Morris:
       "Add Serge Hallyn as security subsystem co-maintainer"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        security: add Serge Hallyn as a maintainer
      894e552c
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 3d09c623
      Linus Torvalds authored
      Pull Xen fixes from David Vrabel:
       "Xen regression and PVH fixes for 3.16-rc1
      
         - fix dom0 PVH memory setup on latest unstable Xen releases
         - fix 64-bit x86 PV guest boot failure on Xen 3.1 and earlier
         - fix resume regression on non-PV (auto-translated physmap) guests"
      
      * tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen/grant-table: fix suspend for non-PV guests
        x86/xen: no need to explicitly register an NMI callback
        Revert "xen/pvh: Update E820 to work with PVH (v2)"
        x86/xen: fix memory setup for PVH dom0
      3d09c623
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 92b94417
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
       "These are primarily bug fixes with a performance improvement patch for
        the GHASH crypto algorithm (which went in during this merging window)
        and dts/defconfig/Kconfig updates.
      
         - ftrace_return_addr() macro fix for arm (introduced earlier via the
           arm64 tree)
         - stack alignment exception entry code fix
         - GHASH crypto algorithm fix and performance improvement
         - CMA buffer limited to 32-bit (until a better way to describe the
           system topology in DT)
         - UAPI sigcontext.h build fix
         - __kernel_old_{gid,uid}_t definitions fix (affecting 32-bit LTP)
         - ptrace fixes (kernel fault and 32-bit arm core dump)
         - pte_mknotpresent() fix
         - dts updates (APM SoC)
         - defconfig and Kconfig update"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: mm: remove broken &= operator from pmd_mknotpresent
        arm64: fix build error in sigcontext.h
        arm64: dts: Add more serial port nodes in APM X-Gene device tree
        arm64/dma: Removing ARCH_HAS_DMA_GET_REQUIRED_MASK macro
        arm64: ptrace: fix empty registers set in prstatus of aarch32 process core
        arm64: uid16: fix __kernel_old_{gid,uid}_t definitions
        arm64: ptrace: change fs when passing kernel pointer to regset code
        arm64: Limit the CMA buffer to 32-bit if ZONE_DMA
        arm/ftrace: fix ftrace_return_addr() to ftrace_return_address()
        arm64/crypto: improve performance of GHASH algorithm
        arm64/crypto: fix data corruption bug in GHASH algorithm
        arm64: defconfig update for LTP
        arm64: ftrace: Fix comment typo 'CONFIG_FUNCTION_GRAPH_FP_TEST'
        arm64: add ARCH_HAS_OPP to allow enabling OPP library
        arm64: restore alphabetic order in Kconfig
        arm64: Bug fix in stack alignment exception
      92b94417
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next · c4222e46
      Linus Torvalds authored
      Pull sparc fixes from David Miller:
       "Sparc sparse fixes from Sam Ravnborg"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next: (67 commits)
        sparc64: fix sparse warnings in int_64.c
        sparc64: fix sparse warning in ftrace.c
        sparc64: fix sparse warning in kprobes.c
        sparc64: fix sparse warning in kgdb_64.c
        sparc64: fix sparse warnings in compat_audit.c
        sparc64: fix sparse warnings in init_64.c
        sparc64: fix sparse warnings in aes_glue.c
        sparc: fix sparse warnings in smp_32.c + smp_64.c
        sparc64: fix sparse warnings in perf_event.c
        sparc64: fix sparse warnings in kprobes.c
        sparc64: fix sparse warning in tsb.c
        sparc64: clean up compat_sigset_t.seta handling
        sparc64: fix sparse "Should it be static?" warnings in signal32.c
        sparc64: fix sparse warnings in sys_sparc32.c
        sparc64: fix sparse warning in pci.c
        sparc64: fix sparse warnings in smp_64.c
        sparc64: fix sparse warning in prom_64.c
        sparc64: fix sparse warning in btext.c
        sparc64: fix sparse warnings in sys_sparc_64.c + unaligned_64.c
        sparc64: fix sparse warning in process_64.c
        ...
      
      Conflicts:
      	arch/sparc/include/asm/pgtable_64.h
      c4222e46
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-cpufreq' and 'pm-cpuidle' · 2ba87ea1
      Rafael J. Wysocki authored
      * pm-cpufreq:
        cpufreq: unlock when failing cpufreq_update_policy()
        intel_pstate: Correct rounding in busy calculation
        cpufreq: cpufreq-cpu0: fix CPU_THERMAL dependency
      
      * pm-cpuidle:
        cpuidle: mvebu: Fix the name of the states
      2ba87ea1
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-sleep' · 639bb92a
      Rafael J. Wysocki authored
      * pm-sleep:
        x86, kaslr: boot-time selectable with hibernation
        PM / hibernate: introduce "nohibernate" boot parameter
      639bb92a
    • Rafael J. Wysocki's avatar
      Merge branches 'acpi-general', 'acpi-processor', 'acpi-lpss' and 'acpi-battery' · cf8116c4
      Rafael J. Wysocki authored
      * acpi-general:
        ACPI: use kstrto*() instead of simple_strto*()
      
      * acpi-processor:
        ACPI / processor replace __attribute__((packed)) by __packed
      
      * acpi-lpss:
        ACPI / LPSS: Take I2C host controllers out of reset
      
      * acpi-battery:
        ACPI / battery: add quirk for Acer Aspire V5-573G
        ACPI / battery: use callback for setting up quirks
      cf8116c4
  3. 18 Jun, 2014 26 commits