1. 06 May, 2013 9 commits
    • Linus Torvalds's avatar
      Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux · 30c67e93
      Linus Torvalds authored
      Pull GPIO changes from Grant Likely:
       "The usual selection of bug fixes and driver updates for GPIO.  Nothing
        really stands out except the addition of the GRGPIO driver and some
        enhacements to ACPI support"
      I'm pulling this despite the earlier mess.  Let's hope it compiles these
      * tag 'gpio-for-linus' of git://git.secretlab.ca/git/linux: (46 commits)
        gpio: grgpio: Add irq support
        gpio: grgpio: Add device driver for GRGPIO cores
        gpiolib-acpi: introduce acpi_get_gpio_by_index() helper
        GPIO: gpio-generic: remove kfree() from bgpio_remove call
        gpio / ACPI: Handle ACPI events in accordance with the spec
        gpio: lpc32xx: Fix off-by-one valid range checking for bank
        gpio: mcp23s08: convert driver to DT
        gpio/omap: force restore if context loss is not detectable
        gpio/omap: optimise interrupt service routine
        gpio/omap: remove extra context restores in *_runtime_resume()
        gpio/omap: free irq domain in probe() failure paths
        gpio: gpio-generic: Add 16 and 32 bit big endian byte order support
        gpio: samsung: Add terminating entry for exynos_pinctrl_ids
        gpio: mvebu: add dbg_show function
        MAX7301 GPIO: Do not force SPI speed when using OF Platform
        gpio: gpio-tps65910.c: fix checkpatch error
        gpio: gpio-timberdale.c: fix checkpatch error
        gpio: gpio-tc3589x.c: fix checkpatch errors
        gpio: gpio-stp-xway.c: fix checkpatch error
        gpio: gpio-sch.c: fix checkpatch error
    • Linus Torvalds's avatar
      Merge tag 'for-3.10-rc1' of git://gitorious.org/linux-pwm/linux-pwm · f87bb9ee
      Linus Torvalds authored
      Pull pwm changes from Thierry Reding:
       "Nothing very exciting this time around.  A couple of bug fixes and a
        lot of cleanup across the board.  The DaVinci 8xx family of SoCs now
        use the same driver as the AM33xx family.
        Many thanks to Axel Lin and Jingoo Han who have done a great job
        fixing various bugs and inconsistencies."
      * tag 'for-3.10-rc1' of git://gitorious.org/linux-pwm/linux-pwm: (27 commits)
        pwm: lpc32xx: Don't change PWM_ENABLE bit in lpc32xx_pwm_config
        pwm: lpc32xx: Properly set PWM_ENABLE bit in lpc32xx_pwm_[enable|disable]
        pwm: Constify OF match tables
        pwm: pwm-tiehrpwm: Update device-tree binding document
        pwm: pwm-tiecap: Update device-tree binding document
        pwm: puv3: Remove unused enabled filed from struct puv3_pwm_chip
        pwm: pxa: Remove PWM_ID_BASE macro
        pwm: spear: Remove unused *dev from struct spear_pwm_chip
        pwm: mxs: Remove unused *dev from struct mxs_pwm_chip
        pwm: twl: Return proper error if twl6030_pwm_enable() fails
        pwm: pxa: Remove clk_enabled field from struct pxa_pwm_chip
        pwm: imx: Remove enabled field from struct imx_chip
        pwm: twl: Add .owner to struct pwm_ops
        pwm: twl-led: Add .owner to struct pwm_ops
        pwm: atmel-tcb: Add .owner to struct pwm_ops
        pwm: ab8500: Add .owner to struct pwm_ops
        pwm: spear: Fix checking return value of clk_enable() and clk_prepare()
        pwm: tiehrpwm: Staticize non-exported symbols
        pwm: tiecap: Staticize non-exported symbols
        pwm: ab8500: Fix trivial typo in dev_err message
    • Linus Torvalds's avatar
      Merge tag 'iommu-updates-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 99737982
      Linus Torvalds authored
      Pull IOMMU updates from Joerg Roedel:
       "The updates are mostly about the x86 IOMMUs this time.
        Exceptions are the groundwork for the PAMU IOMMU from Freescale (for a
        PPC platform) and an extension to the IOMMU group interface.
        On the x86 side this includes a workaround for VT-d to disable
        interrupt remapping on broken chipsets.  On the AMD-Vi side the most
        important new feature is a kernel command-line interface to override
        broken information in IVRS ACPI tables and get interrupt remapping
        working this way.
        Besides that there are small fixes all over the place."
      * tag 'iommu-updates-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (24 commits)
        iommu/tegra: Fix printk formats for dma_addr_t
        iommu: Add a function to find an iommu group by id
        iommu/vt-d: Remove warning for HPET scope type
        iommu: Move swap_pci_ref function to drivers/iommu/pci.h.
        iommu/vt-d: Disable translation if already enabled
        iommu/amd: fix error return code in early_amd_iommu_init()
        iommu/AMD: Per-thread IOMMU Interrupt Handling
        iommu: Include linux/err.h
        iommu/amd: Workaround for ERBT1312
        iommu/amd: Document ivrs_ioapic and ivrs_hpet parameters
        iommu/amd: Don't report firmware bugs with cmd-line ivrs overrides
        iommu/amd: Add ioapic and hpet ivrs override
        iommu/amd: Add early maps for ioapic and hpet
        iommu/amd: Extend IVRS special device data structure
        iommu/amd: Move add_special_device() to __init
        iommu: Fix compile warnings with forward declarations
        iommu/amd: Properly initialize irq-table lock
        iommu/amd: Use AMD specific data structure for irq remapping
        iommu/amd: Remove map_sg_no_iommu()
        iommu/vt-d: add quirk for broken interrupt remapping on 55XX chipsets
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 91f85756
      Linus Torvalds authored
      Pull Ceph changes from Alex Elder:
       "This is a big pull.
        Most of it is culmination of Alex's work to implement RBD image
        layering, which is now complete (yay!).
        There is also some work from Yan to fix i_mutex behavior surrounding
        writes in cephfs, a sync write fix, a fix for RBD images that get
        resized while they are mapped, and a few patches from me that resolve
        annoying auth warnings and fix several bugs in the ceph auth code."
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (254 commits)
        rbd: fix image request leak on parent read
        libceph: use slab cache for osd client requests
        libceph: allocate ceph message data with a slab allocator
        libceph: allocate ceph messages with a slab allocator
        rbd: allocate image object names with a slab allocator
        rbd: allocate object requests with a slab allocator
        rbd: allocate name separate from obj_request
        rbd: allocate image requests with a slab allocator
        rbd: use binary search for snapshot lookup
        rbd: clear EXISTS flag if mapped snapshot disappears
        rbd: kill off the snapshot list
        rbd: define rbd_snap_size() and rbd_snap_features()
        rbd: use snap_id not index to look up snap info
        rbd: look up snapshot name in names buffer
        rbd: drop obj_request->version
        rbd: drop rbd_obj_method_sync() version parameter
        rbd: more version parameter removal
        rbd: get rid of some version parameters
        rbd: stop tracking header object version
        rbd: snap names are pointer to constant data
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · 2e378f3e
      Linus Torvalds authored
      Pull CIFS fixes from Steve French:
       "A set of cifs cleanup fixes.
        The only big one of this set optimizes the cifs error logging,
        renaming cFYI and cERROR macros to cifs_dbg, and in the process makes
        it clearer and reduces module size."
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: small variable name cleanup
        CIFS: fix error return code in cifs_atomic_open()
        cifs: store the real expected sequence number in the mid
        cifs: on send failure, readjust server sequence number downward
        cifs: remove ENOSPC handling in smb_sendv
        [CIFS] cifs: Rename cERROR and cFYI to cifs_dbg
        fs: cifs: use kmemdup instead of kmalloc + memcpy
        cifs: replaced kmalloc + memset with kzalloc
        cifs: ignore the unc= and prefixpath= mount options
    • David Jeffery's avatar
      autofs - remove autofs dentry mount check · ce8a5dbd
      David Jeffery authored
      When checking if an autofs mount point is busy it isn't sufficient to
      only check if it's a mount point.
      For example, if the mount of an offset mountpoint in a tree is denied
      for this host by its export and the dentry becomes a process working
      directory the check incorrectly returns the mount as not in use at
      This can happen since the default when mounting within a tree is
      nostrict, which means ingnore mount fails on mounts within the tree and
      continue.  The nostrict option is meant to allow mounting in this case.
      Signed-off-by: default avatarDavid Jeffery <djeffery@redhat.com>
      Signed-off-by: default avatarIan Kent <raven@themaw.net>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Claudiu Ghioc's avatar
      autofs - fix sparse warning for autofs4_d_manage() · 95482986
      Claudiu Ghioc authored
      Fixed the sparse warning:
        fs/autofs4/root.c:411:5: warning: symbol 'autofs4_d_manage' was not declared. Should it be static?"
      [ Clearly it should be static as the function is declared static at the
        top of root.c.  - imk ]
      Signed-off-by: default avatarClaudiu Ghioc <claudiu.ghioc@gmail.com>
      Signed-off-by: default avatarIan Kent <raven@themaw.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 2bf1bef0
      Linus Torvalds authored
      Pull more s390 updates from Martin Schwidefsky:
       "This is the second batch of s390 patches for the 3.10 merge window.
        Heiko improved the memory detection, this fixes kdump for large memory
        sizes.  Some kvm related memory management work, new ipldev/condev
        keywords in cio and bug fixes."
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390/mem_detect: remove artificial kdump memory types
        s390/mm: add pte invalidation notifier for kvm
        s390/zcrypt: ap bus rescan problem when toggle crypto adapters on/off
        s390/memory hotplug,sclp: get rid of per memory increment usecount
        s390/memory hotplug: provide memory_block_size_bytes() function
        s390/mem_detect: limit memory detection loop to "mem=" parameter
        s390/kdump,bootmem: fix bootmem allocator bitmap size
        s390: get rid of odd global real_memory_size
        s390/kvm: Change the virtual memory mapping location for Virtio devices
        s390/zcore: calculate real memory size using own get_mem_size function
        s390/mem_detect: add DAT sanity check
        s390/mem_detect: fix lockdep irq tracing
        s390/mem_detect: move memory detection code to mm folder
        s390/zfcpdump: exploit new cio_ignore keywords
        s390/cio: add condev keyword to cio_ignore
        s390/cio: add ipldev keyword to cio_ignore
        s390/uaccess: add "fallthrough" comments
    • Linus Torvalds's avatar
      Merge tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next · d7ab7302
      Linus Torvalds authored
      Pull MFD update from Samuel Ortiz:
       "For 3.10 we have a few new MFD drivers for:
         - The ChromeOS embedded controller which provides keyboard, battery
           and power management services.  This controller is accessible
           through i2c or SPI.
         - Silicon Laboratories 476x controller, providing access to their FM
           chipset and their audio codec.
         - Realtek's RTS5249, a memory stick, MMC and SD/SDIO PCI based
         - Nokia's Tahvo power button and watchdog device.  This device is
           very similar to Retu and is thus supported by the same code base.
         - STMicroelectronics STMPE1801, a keyboard and GPIO controller
           supported by the stmpe driver.
         - ST-Ericsson AB8540 and AB8505 power management and voltage
           converter controllers through the existing ab8500 code.
        Some other drivers got cleaned up or improved.  In particular:
         - The Linaro/STE guys got the ab8500 driver in sync with their
           internal code through a series of optimizations, fixes and
         - The AS3711 and OMAP USB drivers now have DT support.
         - The arizona clock and interrupt handling code got improved.
         - The wm5102 register patch and boot mechanism also got improved."
      * tag 'mfd-3.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next: (104 commits)
        mfd: si476x: Don't use 0bNNN
        mfd: vexpress: Handle pending config transactions
        mfd: ab8500: Export ab8500_gpadc_sw_hw_convert properly
        mfd: si476x: Fix i2c warning
        mfd: si476x: Add header files and Kbuild plumbing
        mfd: si476x: Add chip properties handling code
        mfd: si476x: Add the bulk of the core driver
        mfd: si476x: Add commands abstraction layer
        mfd: rtsx: Support RTS5249
        mfd: retu: Add Tahvo support
        mfd: ucb1400: Pass ucb1400-gpio data through ac97 bus
        mfd: wm8994: Add some OF properties
        mfd: wm8994: Add device ID data to WM8994 OF device IDs
        input: Export matrix_keypad_parse_of_params()
        mfd: tps65090: Add compatible string for charger subnode
        mfd: db8500-prcmu: Support platform dependant device selection
        mfd: syscon: Fix warnings when printing resource_size_t
        of: Add stub of_get_parent for non-OF builds
        mfd: omap-usb-tll: Convert to devm_ioremap_resource()
        mfd: omap-usb-host: Convert to devm_ioremap_resource()
  2. 05 May, 2013 31 commits
    • Linus Torvalds's avatar
      Merge tag 'kvm-3.10-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 01227a88
      Linus Torvalds authored
      Pull kvm updates from Gleb Natapov:
       "Highlights of the updates are:
         - new emulated device API
         - legacy device assignment is now optional
         - irqfd interface is more generic and can be shared between arches
         - VMCS shadow support and other nested VMX improvements
         - APIC virtualization and Posted Interrupt hardware support
         - Optimize mmio spte zapping
          - BookE: in-kernel MPIC emulation with irqfd support
          - Book3S: in-kernel XICS emulation (incomplete)
          - Book3S: HV: migration fixes
          - BookE: more debug support preparation
          - BookE: e6500 support
         - reworking of Hyp idmaps
         - ioeventfd for virtio-ccw
        And many other bug fixes, cleanups and improvements"
      * tag 'kvm-3.10-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (204 commits)
        kvm: Add compat_ioctl for device control API
        KVM: x86: Account for failing enable_irq_window for NMI window request
        KVM: PPC: Book3S: Add API for in-kernel XICS emulation
        kvm/ppc/mpic: fix missing unlock in set_base_addr()
        kvm/ppc: Hold srcu lock when calling kvm_io_bus_read/write
        kvm/ppc/mpic: remove users
        kvm/ppc/mpic: fix mmio region lists when multiple guests used
        kvm/ppc/mpic: remove default routes from documentation
        kvm: KVM_CAP_IOMMU only available with device assignment
        ARM: KVM: iterate over all CPUs for CPU compatibility check
        KVM: ARM: Fix spelling in error message
        ARM: KVM: define KVM_ARM_MAX_VCPUS unconditionally
        KVM: ARM: Fix API documentation for ONE_REG encoding
        ARM: KVM: promote vfp_host pointer to generic host cpu context
        ARM: KVM: add architecture specific hook for capabilities
        ARM: KVM: perform HYP initilization for hotplugged CPUs
        ARM: KVM: switch to a dual-step HYP init code
        ARM: KVM: rework HYP page table freeing
        ARM: KVM: enforce maximum size for identity mapped code
        ARM: KVM: move to a KVM provided HYP idmap
    • David Howells's avatar
      Give the OID registry file module info to avoid kernel tainting · 9e687946
      David Howells authored
      Give the OID registry file module information so that it doesn't taint the
      kernel when compiled as a module and loaded.
      Reported-by: default avatarDros Adamson <Weston.Adamson@netapp.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      cc: Trond Myklebust <Trond.Myklebust@netapp.com>
      cc: stable@vger.kernel.org
      cc: linux-nfs@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    • Linus Torvalds's avatar
      Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 534c97b0
      Linus Torvalds authored
      Pull 'full dynticks' support from Ingo Molnar:
       "This tree from Frederic Weisbecker adds a new, (exciting! :-) core
        kernel feature to the timer and scheduler subsystems: 'full dynticks',
        or CONFIG_NO_HZ_FULL=y.
        This feature extends the nohz variable-size timer tick feature from
        idle to busy CPUs (running at most one task) as well, potentially
        reducing the number of timer interrupts significantly.
        This feature got motivated by real-time folks and the -rt tree, but
        the general utility and motivation of full-dynticks runs wider than
         - HPC workloads get faster: CPUs running a single task should be able
           to utilize a maximum amount of CPU power.  A periodic timer tick at
           HZ=1000 can cause a constant overhead of up to 1.0%.  This feature
           removes that overhead - and speeds up the system by 0.5%-1.0% on
           typical distro configs even on modern systems.
         - Real-time workload latency reduction: CPUs running critical tasks
           should experience as little jitter as possible.  The last remaining
           source of kernel-related jitter was the periodic timer tick.
         - A single task executing on a CPU is a pretty common situation,
           especially with an increasing number of cores/CPUs, so this feature
           helps desktop and mobile workloads as well.
        The cost of the feature is mainly related to increased timer
        reprogramming overhead when a CPU switches its tick period, and thus
        slightly longer to-idle and from-idle latency.
        Configuration-wise a third mode of operation is added to the existing
        two NOHZ kconfig modes:
         - CONFIG_HZ_PERIODIC: [formerly !CONFIG_NO_HZ], now explicitly named
           as a config option.  This is the traditional Linux periodic tick
           design: there's a HZ tick going on all the time, regardless of
           whether a CPU is idle or not.
         - CONFIG_NO_HZ_IDLE: [formerly CONFIG_NO_HZ=y], this turns off the
           periodic tick when a CPU enters idle mode.
         - CONFIG_NO_HZ_FULL: this new mode, in addition to turning off the
           tick when a CPU is idle, also slows the tick down to 1 Hz (one
           timer interrupt per second) when only a single task is running on a
        The .config behavior is compatible: existing !CONFIG_NO_HZ and
        CONFIG_NO_HZ=y settings get translated to the new values, without the
        user having to configure anything.  CONFIG_NO_HZ_FULL is turned off by
        This feature is based on a lot of infrastructure work that has been
        steadily going upstream in the last 2-3 cycles: related RCU support
        and non-periodic cputime support in particular is upstream already.
        This tree adds the final pieces and activates the feature.  The pull
        request is marked RFC because:
         - it's marked 64-bit only at the moment - the 32-bit support patch is
           small but did not get ready in time.
         - it has a number of fresh commits that came in after the merge
           window.  The overwhelming majority of commits are from before the
           merge window, but still some aspects of the tree are fresh and so I
           marked it RFC.
         - it's a pretty wide-reaching feature with lots of effects - and
           while the components have been in testing for some time, the full
           combination is still not very widely used.  That it's default-off
           should reduce its regression abilities and obviously there are no
           known regressions with CONFIG_NO_HZ_FULL=y enabled either.
         - the feature is not completely idempotent: there is no 100%
           equivalent replacement for a periodic scheduler/timer tick.  In
           particular there's ongoing work to map out and reduce its effects
           on scheduler load-balancing and statistics.  This should not impact
           correctness though, there are no known regressions related to this
           feature at this point.
         - it's a pretty ambitious feature that with time will likely be
           enabled by most Linux distros, and we'd like you to make input on
           its design/implementation, if you dislike some aspect we missed.
           Without flaming us to crisp! :-)
        Future plans:
         - there's ongoing work to reduce 1Hz to 0Hz, to essentially shut off
           the periodic tick altogether when there's a single busy task on a
           CPU.  We'd first like 1 Hz to be exposed more widely before we go
           for the 0 Hz target though.
         - once we reach 0 Hz we can remove the periodic tick assumption from
           nr_running>=2 as well, by essentially interrupting busy tasks only
           as frequently as the sched_latency constraints require us to do -
           once every 4-40 msecs, depending on nr_running.
        I am personally leaning towards biting the bullet and doing this in
        v3.10, like the -rt tree this effort has been going on for too long -
        but the final word is up to you as usual.
        More technical details can be found in Documentation/timers/NO_HZ.txt"
      * 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)
        sched: Keep at least 1 tick per second for active dynticks tasks
        rcu: Fix full dynticks' dependency on wide RCU nocb mode
        nohz: Protect smp_processor_id() in tick_nohz_task_switch()
        nohz_full: Add documentation.
        cputime_nsecs: use math64.h for nsec resolution conversion helpers
        nohz: Select VIRT_CPU_ACCOUNTING_GEN from full dynticks config
        nohz: Reduce overhead under high-freq idling patterns
        nohz: Remove full dynticks' superfluous dependency on RCU tree
        nohz: Fix unavailable tick_stop tracepoint in dynticks idle
        nohz: Add basic tracing
        nohz: Select wide RCU nocb for full dynticks
        nohz: Disable the tick when irq resume in full dynticks CPU
        nohz: Re-evaluate the tick for the new task after a context switch
        nohz: Prepare to stop the tick on irq exit
        nohz: Implement full dynticks kick
        nohz: Re-evaluate the tick from the scheduler IPI
        sched: New helper to prevent from stopping the tick in full dynticks
        sched: Kick full dynticks CPU that have more than one task enqueued.
        perf: New helper to prevent full dynticks CPUs from stopping tick
        perf: Kick full dynticks CPU if events rotation is needed
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 64049d19
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "Misc fixes plus a small hw-enablement patch for Intel IB model 58
        uncore events"
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf/x86/intel/lbr: Demand proper privileges for PERF_SAMPLE_BRANCH_KERNEL
        perf/x86/intel/lbr: Fix LBR filter
        perf/x86: Blacklist all MEM_*_RETIRED events for Ivy Bridge
        perf: Fix vmalloc ring buffer pages handling
        perf/x86/intel: Fix unintended variable name reuse
        perf/x86/intel: Add support for IvyBridge model 58 Uncore
        perf/x86/intel: Fix typo in perf_event_intel_uncore.c
        x86: Eliminate irq_mis_count counted in arch_irq_stat
    • Linus Torvalds's avatar
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · f8ce1faf
      Linus Torvalds authored
      Pull mudule updates from Rusty Russell:
       "We get rid of the general module prefix confusion with a binary config
        option, fix a remove/insert race which Never Happens, and (my
        favorite) handle the case when we have too many modules for a single
        commandline.  Seriously, the kernel is full, please go away!"
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        modpost: fix unwanted VMLINUX_SYMBOL_STR expansion
        X.509: Support parse long form of length octets in Authority Key Identifier
        module: don't unlink the module until we've removed all exposure.
        kernel: kallsyms: memory override issue, need check destination buffer length
        MODSIGN: do not send garbage to stderr when enabling modules signature
        modpost: handle huge numbers of modules.
        modpost: add -T option to read module names from file/stdin.
        modpost: minor cleanup.
        genksyms: pass symbol-prefix instead of arch
        module: fix symbol versioning with symbol prefixes
        CONFIG_SYMBOL_PREFIX: cleanup.
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs · 24d0c254
      Linus Torvalds authored
      Pull single_open() leak fixes from Al Viro:
       "A bunch of fixes for a moderately common class of bugs: file with
        single_open() done by its ->open() and seq_release as its ->release().
        That leaks; fortunately, it's not _too_ common (either people manage
        to RTFM that says "When using single_open(), the programmer should use
        single_release() instead of seq_release() in the file_operations
        structure to avoid a memory leak", or they just copy a correct
        instance), but grepping through the tree has caught quite a pile.
        All of that is, AFAICS, -stable fodder, for as far as the patches
        apply.  I tried to carve it up into reasonably-sized pieces (more or
        less "comes from the same tree")"
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
        rcutrace: single_open() leaks
        gadget: single_open() leaks
        staging: single_open() leaks
        megaraid: single_open() leak
        wireless: single_open() leaks
        input: single_open() leak
        rtc: single_open() leaks
        ds1620: single_open() leak
        sh: single_open() leaks
        parisc: single_open() leaks
        mips: single_open() leaks
        ia64: single_open() leaks
        h8300: single_open() leaks
        cris: single_open() leaks
        arm: single_open() leaks
    • Linus Torvalds's avatar
      Merge branch 'ipc-cleanups' · 802d0db8
      Linus Torvalds authored
      Merge ipc fixes and cleanups from my IPC branch.
      The ipc locking has always been pretty ugly, and the scalability fixes
      to some degree made it even less readable.  We had two cases of double
      unlocks in error paths due to this (one rcu read unlock, one semaphore
      unlock), and this fixes the bugs I found while trying to clean things up
      a bit so that we are less likely to have more.
      * ipc-cleanups:
        ipc: simplify rcu_read_lock() in semctl_nolock()
        ipc: simplify semtimedop/semctl_main() common error path handling
        ipc: move sem_obtain_lock() rcu locking into the only caller
        ipc: fix double sem unlock in semctl error path
        ipc: move the rcu_read_lock() from sem_lock_and_putref() into callers
        ipc: sem_putref() does not need the semaphore lock any more
        ipc: move rcu_read_unlock() out of sem_unlock() and into callers
    • Scott Wood's avatar
      kvm: Add compat_ioctl for device control API · db6ae615
      Scott Wood authored
      This API shouldn't have 32/64-bit issues, but VFS assumes it does
      unless told otherwise.
      Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
      Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
    • Peter Zijlstra's avatar
      perf/x86/intel/lbr: Demand proper privileges for PERF_SAMPLE_BRANCH_KERNEL · 7cc23cd6
      Peter Zijlstra authored
      We should always have proper privileges when requesting kernel
      Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: <stable@kernel.org>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: eranian@google.com
      Link: http://lkml.kernel.org/r/20130503121256.230745028@chello.nl
      [ Fix build error reported by fengguang.wu@intel.com, propagate error code back. ]
      Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
      Link: http://lkml.kernel.org/n/tip-v0x9ky3ahzr6nm3c6ilwrili@git.kernel.org
    • Al Viro's avatar
      rcutrace: single_open() leaks · 7ee2b9e5
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      gadget: single_open() leaks · 962a1ab2
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      staging: single_open() leaks · bae301d3
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      megaraid: single_open() leak · 9bec8a74
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      wireless: single_open() leaks · bc3041f0
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      input: single_open() leak · 9b3a0a6f
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      rtc: single_open() leaks · 2e7718cf
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      ds1620: single_open() leak · 7485e16c
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      sh: single_open() leaks · c39b9fd7
      Al Viro authored
      Cc: vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      parisc: single_open() leaks · 46d4c0ff
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      mips: single_open() leaks · acf300dd
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      ia64: single_open() leaks · 75401461
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      h8300: single_open() leaks · a81ecc16
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      cris: single_open() leaks · f42787df
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Al Viro's avatar
      arm: single_open() leaks · b11ac20e
      Al Viro authored
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
    • Dan Carpenter's avatar
      cifs: small variable name cleanup · b13ce4bb
      Dan Carpenter authored
      server and ses->server are the same, but it's a little bit ugly that we
      lock &ses->server->srv_mutex and unlock &server->srv_mutex.  It causes
      a false positive in Smatch about inconsistent locking.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
    • Wei Yongjun's avatar
      CIFS: fix error return code in cifs_atomic_open() · efb79f28
      Wei Yongjun authored
      Fix to return a negative error code from the error handling
      case instead of 0, as returned elsewhere in this function.
      Signed-off-by: default avatarWei Yongjun <yongjun_wei@trendmicro.com.cn>
      Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
      Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
    • Jeff Layton's avatar
      cifs: store the real expected sequence number in the mid · 0124cc45
      Jeff Layton authored
      Currently, the signing routines take a pointer to a place to store the
      expected sequence number for the mid response. It then stores a value
      that's one below what that sequence number should be, and then adds one
      to it when verifying the signature on the response.
      Increment the sequence number before storing the value in the mid, and
      eliminate the "+1" when checking the signature.
      Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
      Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
    • Jeff Layton's avatar
      cifs: on send failure, readjust server sequence number downward · ad313cb8
      Jeff Layton authored
      If sending a call to the server fails for some reason (for instance, the
      sending thread caught a signal), then we must readjust the sequence
      number downward again or the next send will have it too high.
      Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
      Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
    • Jeff Layton's avatar
      cifs: remove ENOSPC handling in smb_sendv · ce6c44e4
      Jeff Layton authored
      To my knowledge, no one ever reported seeing this pop.
      Acked-by: default avatarSuresh Jayaraman <sjayaraman@novell.com>
      Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
      Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
    • Joe Perches's avatar
      [CIFS] cifs: Rename cERROR and cFYI to cifs_dbg · f96637be
      Joe Perches authored
      It's not obvious from reading the macro names that these macros
      are for debugging.  Convert the names to a single more typical
      kernel style cifs_dbg macro.
      	cERROR(1, ...)   -> cifs_dbg(VFS, ...)
      	cFYI(1, ...)     -> cifs_dbg(FYI, ...)
      	cFYI(DBG2, ...)  -> cifs_dbg(NOISY, ...)
      Move the terminating format newline from the macro to the call site.
      Add CONFIG_CIFS_DEBUG function cifs_vfs_err to emit the
      "CIFS VFS: " prefix for VFS messages.
      Size is reduced ~ 1% when CONFIG_CIFS_DEBUG is set (default y)
      $ size fs/cifs/cifs.ko*
         text    data     bss     dec     hex filename
       265245	   2525	    132	 267902	  4167e	fs/cifs/cifs.ko.new
       268359    2525     132  271016   422a8 fs/cifs/cifs.ko.old
      Other miscellaneous changes around these conversions:
      o Miscellaneous typo fixes
      o Add terminating \n's to almost all formats and remove them
        from the macros to be more kernel style like.  A few formats
        previously had defective \n's
      o Remove unnecessary OOM messages as kmalloc() calls dump_stack
      o Coalesce formats to make grep easier,
        added missing spaces when coalescing formats
      o Use %s, __func__ instead of embedded function name
      o Removed unnecessary "cifs: " prefixes
      o Convert kzalloc with multiply to kcalloc
      o Remove unused cifswarn macro
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 1aaf6d3d
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       1) Several routines do not use netdev_features_t to hold such bitmasks,
          fixes from Patrick McHardy and Bjørn Mork.
       2) Update cpsw IRQ software state and the actual HW irq enabling in the
          correct order.  From Mugunthan V N.
       3) When sending tipc packets to multiple bearers, we have to make
          copies of the SKB rather than just giving the original SKB directly.
          Fix from Gerlando Falauto.
       4) Fix race with bridging topology change timer, from Stephen
       5) Fix TCPv6 segmentation handling in GRE and VXLAN, from Pravin B
       6) Endian bug in USB pegasus driver, from Dan Carpenter.
       7) Fix crashes on MTU reduction in USB asix driver, from Holger
       8) Don't allow the kernel to BUG() just because the user puts some crap
          in an AF_PACKET mmap() ring descriptor.  Fix from Daniel Borkmann.
       9) Don't use variable sized arrays on the stack in xen-netback, from
          Wei Liu.
      10) Fix stats reporting and an unbalanced napi_disable() in be2net
          driver.  From Somnath Kotur and Ajit Khaparde.
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (25 commits)
        cxgb4: fix error recovery when t4_fw_hello returns a positive value
        sky2: Fix crash on receiving VLAN frames
        packet: tpacket_v3: do not trigger bug() on wrong header status
        asix: fix BUG in receive path when lowering MTU
        net: qmi_wwan: Add Telewell TW-LTE 4G
        usbnet: pegasus: endian bug in write_mii_word()
        vxlan: Fix TCPv6 segmentation.
        gre: Fix GREv4 TCPv6 segmentation.
        bridge: fix race with topology change timer
        tipc: pskb_copy() buffers when sending on more than one bearer
        tipc: tipc_bcbearer_send(): simplify bearer selection
        tipc: cosmetic: clean up comments and break a long line
        drivers: net: cpsw: irq not disabled in cpsw isr in particular sequence
        xen-netback: better names for thresholds
        xen-netback: avoid allocating variable size array on stack
        xen-netback: remove redundent parameter in netbk_count_requests
        be2net: Fix to fail probe if MSI-X enable fails for a VF
        be2net: avoid napi_disable() when it has not been enabled
        be2net: Fix firmware download for Lancer
        be2net: Fix to receive Multicast Packets when Promiscuous mode is enabled on certain devices