Skip to content
  1. May 19, 2013
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · 3c6a279f
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "Patching up across the field.  The reversion of the two ASID patches
        is particularly important as it was breaking many platforms."
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: ralink: use the dwc2 driver for the rt305x USB controller
        MIPS: Extract schedule_mfi info from __schedule
        MIPS: Fix sibling call handling in get_frame_info
        MIPS: MSP71xx: remove inline marking of EXPORT_SYMBOL functions
        MIPS: Make virt_to_phys() work for all unmapped addresses.
        MIPS: Fix build error for crash_dump.c in 3.10-rc1
        MIPS: Xway: Fix clk leak
        Revert "MIPS: Allow ASID size to be determined at boot time."
        Revert "MIPS: microMIPS: Support dynamic ASID sizing."
      3c6a279f
    • Linus Torvalds's avatar
      Merge tag 'kmemleak-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 8f05bde9
      Linus Torvalds authored
      Pull kmemleak patches from Catalin Marinas:
       "Kmemleak now scans all the writable and non-executable module sections
        to avoid false positives (previously it was only scanning specific
        sections and missing .ref.data)."
      
      * tag 'kmemleak-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        kmemleak: No need for scanning specific module sections
        kmemleak: Scan all allocated, writeable and not executable module sections
      8f05bde9
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · f71df633
      Linus Torvalds authored
      Pull arm64 fixes from Catalin Marinas:
       "Fixes for duplicate definition of early_console, kernel/time/Kconfig
        include, __flush_dcache_all() set/way computing, debug (locking, bit
        testing).  The of_platform_populate() was moved to an arch_init_call()
        to allow subsys_init_call() drivers to probe the DT."
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: debug: fix mdscr.ss check when enabling debug exceptions
        arm64: Do not source kernel/time/Kconfig explicitly
        arm64: mm: Fix operands of clz in __flush_dcache_all
        arm64: Invoke the of_platform_populate() at arch_initcall() level
        arm64: debug: clear mdscr_el1 instead of taking the OS lock
        arm64: Fix duplicate definition of early_console
      f71df633
  2. May 18, 2013
    • Matthijs Kooijman's avatar
      MIPS: ralink: use the dwc2 driver for the rt305x USB controller · 2792d42f
      Matthijs Kooijman authored
      
      
      This sets up the devicetree file for the rt3050 chip series and rt3052
      eval board to use the right compatible string for the dwc2 driver.
      
      Acked-by: default avatarJohn Crispin <blogic@openwrt.org>
      Cc: blogic@openwrt.org
      Cc: linux-mips@linux-mips.org
      Cc: Matthijs Kooijman <matthijs@stdin.nl>
      Patchwork: https://patchwork.linux-mips.org/patch/5226/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      2792d42f
    • Tony Wu's avatar
      MIPS: Extract schedule_mfi info from __schedule · 5000653e
      Tony Wu authored
      
      
      schedule_mfi is supposed to be extracted from schedule(), and
      is used in thread_saved_pc and get_wchan.
      
      But, after optimization, schedule() is reduced to a sibling
      call to __schedule(), and no real frame info can be extracted.
      
      One solution is to compile schedule() with -fno-omit-frame-pointer
      and -fno-optimize-sibling-calls, but that will incur performance
      degradation.
      
      Another solution is to extract info from the real scheduler,
      __schedule, and this is the approache adopted here.
      
      This patch reads the __schedule address by either following
      the 'j' call in schedule if KALLSYMS is disabled or by using
      kallsyms_lookup_name to lookup __schedule if KALLSYMS is
      available, then, extracts schedule_mfi from __schedule frame info.
      
      This patch also fixes the "Can't analyze schedule() prologue"
      warning at boot time.
      
      Signed-off-by: default avatarTony Wu <tung7970@gmail.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5237/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      5000653e
    • Tony Wu's avatar
      MIPS: Fix sibling call handling in get_frame_info · e7438c4b
      Tony Wu authored
      
      
      Given a function, get_frame_info() analyzes its instructions
      to figure out frame size and return address. get_frame_info()
      works as follows:
      
      1. analyze up to 128 instructions if the function size is unknown
      2. search for 'addiu/daddiu sp,sp,-immed' for frame size
      3. search for 'sw ra,offset(sp)' for return address
      4. end search when it sees jr/jal/jalr
      
      This leads to an issue when the given function is a sibling
      call, example shown as follows.
      
      801ca110 <schedule>:
      801ca110:       8f820000        lw      v0,0(gp)
      801ca114:       8c420000        lw      v0,0(v0)
      801ca118:       080726f0        j       801c9bc0 <__schedule>
      801ca11c:       00000000        nop
      
      801ca120 <io_schedule>:
      801ca120:       27bdffe8        addiu   sp,sp,-24
      801ca124:       3c028022        lui     v0,0x8022
      801ca128:       afbf0014        sw      ra,20(sp)
      
      In this case, get_frame_info() cannot properly detect schedule's
      frame info, and eventually returns io_schedule's instead.
      
      This patch adds 'j' to the end search condition to workaround
      sibling call cases.
      
      Signed-off-by: default avatarTony Wu <tung7970@gmail.com>
      Cc: linux-mips@linux-mips.org
      Patchwork: https://patchwork.linux-mips.org/patch/5236/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      e7438c4b
    • Denis Efremov's avatar
      MIPS: MSP71xx: remove inline marking of EXPORT_SYMBOL functions · d552b233
      Denis Efremov authored
      
      
      EXPORT_SYMBOL and inline directives are contradictory to each other.
      The patch fixes this inconsistency.
      
      Found by Linux Driver Verification project (linuxtesting.org).
      
      Signed-off-by: default avatarDenis Efremov <yefremov.denis@gmail.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: trivial@kernel.org
      Cc: ldv-project@linuxtesting.org
      Patchwork: https://patchwork.linux-mips.org/patch/5227/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      d552b233
    • David Daney's avatar
      MIPS: Make virt_to_phys() work for all unmapped addresses. · 49c426ba
      David Daney authored
      
      
      As reported:
        This problem was discovered when doing BGP traffic with the TCP MD5 option
        activated, where the following call chain caused a crash:
      
         * tcp_v4_rcv
         *  tcp_v4_timewait_ack
         *   tcp_v4_send_ack -> follow stack variable rep.th
         *    tcp_v4_md5_hash_hdr
         *     tcp_md5_hash_header
         *      sg_init_one
         *       sg_set_buf
         *        virt_to_page
      
        I noticed that tcp_v4_send_reset uses a similar stack variable and
        also calls tcp_v4_md5_hash_hdr, so it has the same problem.
      
      The networking core can indirectly call virt_to_phys() on stack
      addresses, if this is done from PID 0, the stack will usually be in
      CKSEG0, so virt_to_phys() needs to work there as well
      
      Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
      Cc: linux-mips@linux-mips.org
      Cc: Jiang Liu <liuj97@gmail.com>
      Cc: eunb.song@samsung.com
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/5220/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      49c426ba
    • EunBong Song's avatar
      MIPS: Fix build error for crash_dump.c in 3.10-rc1 · e84ff425
      EunBong Song authored
      
      
      This patch fixes crash_dump.c build error. Build error logs are as follow.
      
      arch/mips/kernel/crash_dump.c: In function 'kdump_buf_page_init':
      arch/mips/kernel/crash_dump.c:67: error: implicit declaration of function 'kmalloc'
      arch/mips/kernel/crash_dump.c:67: error: assignment makes pointer from integer without a cast
      
      Signed-off-by: default avatarEunBong Song <eunb.song@samsung.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Patchwork: https://patchwork.linux-mips.org/patch/5238/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      e84ff425
    • Libo Chen's avatar
      MIPS: Xway: Fix clk leak · bda97ed3
      Libo Chen authored
      
      
      When gptu_r32 fails, we should put clk before returning.
      
      Signed-off-by: default avatarLibo Chen <libo.chen@huawei.com>
      Acked-by: default avatarJohn Crispin <blogic@openwrt.org>
      Cc: grant.likely@linaro.org
      Cc: rob.herring@calxeda.com,
      Cc: linux-mips@linux-mips.org
      Cc: LKML linux-kernel@vger.kernel.org
      Cc: Andrew Morton akpm@linux-foundation.org
      Cc: Li Zefan lizefan@huawei.com
      Patchwork: https://patchwork.linux-mips.org/patch/5247/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      bda97ed3
    • Will Deacon's avatar
      arm64: debug: fix mdscr.ss check when enabling debug exceptions · 3126976b
      Will Deacon authored
      
      
      When we take an exception at EL1, we only want to enable debug
      exceptions if we're not currently stepping, otherwise we can easily get
      stuck in a loop stepping into interrupt handlers.
      
      Unfortunately, the current code tests the wrong bit in the mdscr, so fix
      that.
      
      Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      3126976b
  3. May 17, 2013
    • Linus Torvalds's avatar
      Merge tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 8f710dd3
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "A fairly calm update at this time, as seen in the short log, only one
        fix per person: including,
      
         - a few ASoC fixes (da7213 dmic, ux500 AD slot, wm0010 error path)
         - a copule of HD-audio fixes
         - a few other misc fixes (MIPS allmodconfig, proc output in usb, old
           PowerBook support)"
      
      * tag 'sound-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: usb-audio: proc: use found syncmaxsize to determine feedback format
        ALSA: hda - Add headset mic support for another Dell machine
        ALSA: snd-aoa: Add a layout entry for PowerBook6,5
        ALSA: hda - Check the activity of the NID to be powered down
        sound: Fix make allmodconfig on MIPS correctly
        ASoC: da7213: Fix setting dmic_samplephase and dmic_clk_rate
        ASoC: ux500: Swap even/odd AD slot definitions
        ASoC: wm0010: fix error return code in wm0010_boot()
      8f710dd3
    • Steven Rostedt's avatar
      kmemleak: No need for scanning specific module sections · 89c83735
      Steven Rostedt authored
      
      
      As kmemleak now scans all module sections that are allocated, writable
      and non executable, there's no need to scan individual sections that
      might reference data.
      
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      89c83735
    • Steven Rostedt's avatar
      kmemleak: Scan all allocated, writeable and not executable module sections · 06c9494c
      Steven Rostedt authored
      
      
      Instead of just picking data sections by name (names that start
      with .data, .bss or .ref.data), use the section flags and scan all
      sections that are allocated, writable and not executable. Which should
      cover all sections of a module that might reference data.
      
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      [catalin.marinas@arm.com: removed unused 'name' variable]
      [catalin.marinas@arm.com: collapsed 'if' blocks]
      Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
      Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
      06c9494c
    • Torstein Hegge's avatar
      ALSA: usb-audio: proc: use found syncmaxsize to determine feedback format · e6135fe9
      Torstein Hegge authored
      
      
      freqshift is only set for the data endpoint and syncmaxsize is only set
      for the sync endpoint. This results in a syncmaxsize of zero used in the
      proc output feedback format calculation, which gives a feedback format
      incorrectly shown as 8.16 for UAC2 devices.
      
      As neither the data nor the sync endpoint gives all the relevant
      content, output the two combined.
      
      Also remove the sync_endpoint "packet size" which is always zero
      and the sync_endpoint "momentary freq" which is constant.
      
      Tested with UAC2 async and UAC1 adaptive, not tested with UAC1 async.
      
      Reported-by: default avatarB. Zhang <bb.zhang@free.fr>
      Signed-off-by: default avatarTorstein Hegge <hegge@resisty.net>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      e6135fe9
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · ec50f2a9
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Fix for radeon nomodeset regression, old radeon interface cliprects
        fix, 2 qxl crasher fixes, and a couple of minor cleanups.
      
        I may have a new AMD hw support branch next week, its one of those
        doesn't affect anything existing just adds new support, I'll see how
        it shapes up and I might ask you to take it, just thought I'd warn in
        advance."
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux:
        drm/radeon: restore nomodeset operation (v2)
        qxl: fix bug with object eviction and update area
        drm/qxl: drop active_user_framebuffer as its unneeded
        qxl: drop unused variable.
        drm/qxl: fix ioport interactions for kernel submitted commands.
        drm: remove unused wrapper macros
        drm/radeon: check incoming cliprects pointer
      ec50f2a9
    • Dave Airlie's avatar
      drm/radeon: restore nomodeset operation (v2) · e9ced8e0
      Dave Airlie authored
      
      
      When UMS was deprecated it removed support for nomodeset commandline
      we really want this in distro land so we can debug stuff, everyone
      should fallback to vesa correctly.
      
      v2: oops -1 isn't used anymore, restore original behaviour
      -1 is default, so we can boot with nomodeset on the command line,
      then use radeon.modeset=1 to override it for debugging later.
      
      Cc: stable@vger.kernel.org
      Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
      Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      e9ced8e0
    • Dave Airlie's avatar
      qxl: fix bug with object eviction and update area · b90ed1e9
      Dave Airlie authored
      
      
      if the surface is evicted, this validation will happen
      to the wrong place, I noticed this with other work I was
      doing, haven't seen it go wrong in practice.
      
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      b90ed1e9
    • Dave Airlie's avatar
      drm/qxl: drop active_user_framebuffer as its unneeded · b2b4465d
      Dave Airlie authored
      
      
      This was a bogus way to figure out what the active framebuffer was,
      just check if the underlying bo is the primary bo.
      
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      b2b4465d
    • Dave Airlie's avatar
      qxl: drop unused variable. · d7292a07
      Dave Airlie authored
      
      
      this boolean isn't used anymore so drop it.
      
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      d7292a07
    • Dave Airlie's avatar
      drm/qxl: fix ioport interactions for kernel submitted commands. · a6ac1bc3
      Dave Airlie authored
      
      
      So qxl has ioports, but it really really really doesn't want you
      to write to them twice, but if you write and get a signal before
      the irq arrives to let you know its completed, you have to think
      ahead and avoid writing another time.
      
      However this works fine for update area where really multiple
      writes aren't the end of the world, however with create primary
      surface, you can't ever do multiple writes. So this stop internal
      kernel writes from doing interruptible waits, because otherwise
      we have no idea if this write is a new one or a continuation of
      a previous one.
      
      virtual hw sucks more than real hw.
      
      This fixes lockups and VM crashes when resizing and starting/stopping
      X.
      
      Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
      a6ac1bc3
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · d5fe85af
      Linus Torvalds authored
      Pull power management and ACPI fixes from Rafael Wysocki:
      
       - intel_pstate driver fixes and cleanups from Dirk Brandewie and Wei
         Yongjun.
      
       - cpufreq fixes related to ARM big.LITTLE support and the cpufreq-cpu0
         driver from Viresh Kumar.
      
       - Assorted cpufreq fixes from Srivatsa S Bhat, Borislav Petkov, Wolfram
         Sang, Alexander Shiyan, and Nishanth Menon.
      
       - Assorted ACPI fixes from Catalin Marinas, Lan Tianyu, Alex Hung,
         Jan-Simon Möller, and Rafael J Wysocki.
      
       - Fix for a kfree() under spinlock in the PM core from Shuah Khan.
      
       - PM documentation updates from Borislav Petkov and Zhang Rui.
      
      * tag 'pm+acpi-3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (30 commits)
        cpufreq: Preserve sysfs files across suspend/resume
        ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path
        PM / hibernate: Correct documentation
        PM / Documentation: remove inaccurate suspend/hibernate transition lantency statement
        PM: Documentation update for freeze state
        cpufreq / intel_pstate: use vzalloc() instead of vmalloc()/memset(0)
        cpufreq, ondemand: Remove leftover debug line
        PM: Avoid calling kfree() under spinlock in dev_pm_put_subsys_data()
        cpufreq / kirkwood: don't check resource with devm_ioremap_resource
        cpufreq / intel_pstate: remove #ifdef MODULE compile fence
        cpufreq / intel_pstate: Remove idle mode PID
        cpufreq / intel_pstate: fix ffmpeg regression
        cpufreq / intel_pstate: use lowest requested max performance
        cpufreq / intel_pstate: remove idle time and duration from sample and calculations
        cpufreq: Fix incorrect dependecies for ARM SA11xx drivers
        cpufreq: ARM big LITTLE: Fix Kconfig entries
        cpufreq: cpufreq-cpu0: Free parent node for error cases
        cpufreq: cpufreq-cpu0: defer probe when regulator is not ready
        cpufreq: Issue CPUFREQ_GOV_POLICY_EXIT notifier before dropping policy refcount
        cpufreq: governors: Fix CPUFREQ_GOV_POLICY_{INIT|EXIT} notifiers
        ...
      d5fe85af
    • Linus Torvalds's avatar
      Merge tag 'ntb-bugfixes-3.10' of git://github.com/jonmason/ntb · 89682165
      Linus Torvalds authored
      Pull NTB update from Jon Mason:
       "NTB bug fixes to address Smatch/Coverity errors, link toggling bugs,
        and a few corner cases in the driver."
      
      This pull request came in during the merge window, but without any
      signage etc.  So I'm taking it late, because it wasn't _originally_
      late.
      
      * tag 'ntb-bugfixes-3.10' of git://github.com/jonmason/ntb:
        NTB: Multiple NTB client fix
        ntb_netdev: remove from list on exit
        NTB: memcpy lockup workaround
        NTB: Correctly handle receive buffers of the minimal size
        NTB: reset tx_index on link toggle
        NTB: Link toggle memory leak
        NTB: Handle 64bit BAR sizes
        NTB: fix pointer math issues
        ntb: off by one sanity checks
        NTB: variable dereferenced before check
      89682165
    • Linus Torvalds's avatar
      Merge branch 'ipmi' (minor ipmi fixes from Corey) · e2a978ec
      Linus Torvalds authored
      Merge ipmi fixes from Corey Minyard:
       "Some minor fixes I had queued up.  The last one came in recently
        (patch 4) and it and patch 2 are candidates for stable-kernel."
      
      * emailed patches from Corey Minyard <cminyard@mvista.com>:
        ipmi: ipmi_devintf: compat_ioctl method fails to take ipmi_mutex
        ipmi: Improve error messages on failed irq enable
        drivers/char/ipmi: memcpy, need additional 2 bytes to avoid memory overflow
        drivers: char: ipmi: Replaced kmalloc and strcpy with kstrdup
      e2a978ec
    • Benjamin LaHaise's avatar
      ipmi: ipmi_devintf: compat_ioctl method fails to take ipmi_mutex · 6368087e
      Benjamin LaHaise authored
      
      
      When a 32 bit version of ipmitool is used on a 64 bit kernel, the
      ipmi_devintf code fails to correctly acquire ipmi_mutex.  This results in
      incomplete data being retrieved in some cases, or other possible failures.
      Add a wrapper around compat_ipmi_ioctl() to take ipmi_mutex to fix this.
      
      Signed-off-by: default avatarBenjamin LaHaise <bcrl@kvack.org>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      6368087e
    • Corey Minyard's avatar
      ipmi: Improve error messages on failed irq enable · 0849bfec
      Corey Minyard authored
      
      
      When the interrupt enable message returns an error, the messages are
      not entirely accurate nor helpful.  So improve them.
      
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Cc: Andy Lutomirski <luto@amacapital.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      0849bfec
    • Chen Gang's avatar
      drivers/char/ipmi: memcpy, need additional 2 bytes to avoid memory overflow · a5f2b3d6
      Chen Gang authored
      
      
      When calling memcpy, read_data and write_data need additional 2 bytes.
      
        write_data:
          for checking:  "if (size > IPMI_MAX_MSG_LENGTH)"
          for operating: "memcpy(bt->write_data + 3, data + 1, size - 1)"
      
        read_data:
          for checking:  "if (msg_len < 3 || msg_len > IPMI_MAX_MSG_LENGTH)"
          for operating: "memcpy(data + 2, bt->read_data + 4, msg_len - 2)"
      
      Signed-off-by: default avatarChen Gang <gang.chen@asianux.com>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      a5f2b3d6
    • Alexandru Gheorghiu's avatar
      drivers: char: ipmi: Replaced kmalloc and strcpy with kstrdup · 1b6b698f
      Alexandru Gheorghiu authored
      
      
      Replaced calls to kmalloc followed by strcpy with a sincle call to
      kstrdup.  Patch found using coccinelle.
      
      Signed-off-by: default avatarAlexandru Gheorghiu <gheorghiuandru@gmail.com>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1b6b698f
    • Linus Torvalds's avatar
      Merge branch 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 4a007ed9
      Linus Torvalds authored
      Pull workqueue fixes from Tejun Heo:
       "Three more workqueue regression fixes.
      
         - Fix unbalanced unlock in trylock failure path of manage_workers().
           This shouldn't happen often in the wild but is possible.
      
         - While making schedule_work() and friends inline, they become
           unavailable to !GPL modules.  Allow !GPL modules to access basic
           stuff - system_wq and queue_*work_on() - so that schedule_work()
           and friends can be used.
      
         - During boot, the unbound NUMA support code allocates a cpumask for
           each possible node using alloc_cpumask_var_node(), which ends up
           trying to allocate node-specific memory even for offline nodes
           triggering BUG in the memory alloc code.  Use NUMA_NO_NODE for
           offline nodes."
      
      * 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: don't perform NUMA-aware allocations on offline nodes in wq_numa_init()
        workqueue: Make schedule_work() available again to non GPL modules
        workqueue: correct handling of the pool spin_lock
      4a007ed9
    • Linus Torvalds's avatar
      Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu · ff89acc5
      Linus Torvalds authored
      Pull RCU fixes from Paul McKenney:
       "A couple of fixes for RCU regressions:
      
         - A boneheaded boolean-logic bug that resulted in excessive delays on
           boot, hibernation and suspend that was reported by Borislav Petkov,
           Bjørn Mork, and Joerg Roedel.  The fix inserts a single "!".
      
         - A fix for a boot-time splat due to allocating from bootmem too late
           in boot, fix courtesy of Sasha Levin with additional help from
           Yinghai Lu."
      
      * 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu:
        rcu: Don't allocate bootmem from rcu_init()
        rcu: Fix comparison sense in rcu_needs_cpu()
      ff89acc5
    • Oleg Nesterov's avatar
      usermodehelper: check subprocess_info->path != NULL · 264b83c0
      Oleg Nesterov authored
      
      
      argv_split(empty_or_all_spaces) happily succeeds, it simply returns
      argc == 0 and argv[0] == NULL. Change call_usermodehelper_exec() to
      check sub_info->path != NULL to avoid the crash.
      
      This is the minimal fix, todo:
      
       - perhaps we should change argv_split() to return NULL or change the
         callers.
      
       - kill or justify ->path[0] check
      
       - narrow the scope of helper_lock()
      
      Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
      Acked-By: default avatarLucas De Marchi <lucas.demarchi@intel.com>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      264b83c0
    • David Daney's avatar
      Revert "MIPS: Allow ASID size to be determined at boot time." · 48c4ac97
      David Daney authored
      This reverts commit d532f3d2
      
      .
      
      The original commit has several problems:
      
      1) Doesn't work with 64-bit kernels.
      
      2) Calls TLBMISS_HANDLER_SETUP() before the code is generated.
      
      3) Calls TLBMISS_HANDLER_SETUP() twice in per_cpu_trap_init() when
         only one call is needed.
      
      [ralf@linux-mips.org: Also revert the bits of the ASID patch which were
      hidden in the KVM merge.]
      
      Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: "Steven J. Hill" <Steven.Hill@imgtec.com>
      Cc: David Daney <david.daney@cavium.com>
      Patchwork: https://patchwork.linux-mips.org/patch/5242/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      48c4ac97
    • David Daney's avatar
      Revert "MIPS: microMIPS: Support dynamic ASID sizing." · 8ea6cd7a
      David Daney authored
      This reverts commit f6b06d93
      
      .
      
      The next revert depends on this one, so this has to go too.
      
      Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
      Cc: linux-mips@linux-mips.org
      Cc: linux-kernel@vger.kernel.org
      Cc: "Steven J. Hill" <Steven.Hill@imgtec.com>
      Cc: David Daney <david.daney@cavium.com>
      Patchwork: https://patchwork.linux-mips.org/patch/5241/
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      8ea6cd7a
  4. May 16, 2013
    • Linus Torvalds's avatar
      Merge branch 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 5c64e3a4
      Linus Torvalds authored
      Pull target fixes from Nicholas Bellinger:
       "A handful of fixes + minor changes this time around, along with one
        important >= v3.9 regression fix for IBLOCK backends.  The highlights
        include:
      
         - Use FD_MAX_SECTORS in FILEIO for block_device as
           well as files (agrover)
      
         - Fix processing of out-of-order CmdSNs with
           iSBD driver (shlomo)
      
         - Close long-standing target_put_sess_cmd() vs.
           core_tmr_abort_task() race with the addition of
           kref_put_spinlock_irqsave() (joern + greg-kh)
      
         - Fix IBLOCK WCE=1 + DPOFUA=1 backend WRITE
           regression in >= v3.9 (nab + bootc)
      
        Note these four patches are CC'ed to stable.
      
        Also, there is still some work left to be done on the active I/O
        shutdown path in target_wait_for_sess_cmds() used by tcm_qla2xxx +
        ib_isert fabrics that is still being discussed on the list, and will
        hopefully be resolved soon."
      
      * 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target: close target_put_sess_cmd() vs. core_tmr_abort_task() race
        target: removed unused transport_state flag
        target/iblock: Fix WCE=1 + DPOFUA=1 backend WRITE regression
        MAINTAINERS: Update target git tree URL
        iscsi-target: Fix typos in RDMAEXTENSIONS macro usage
        target/rd: Add ramdisk bit for NULLIO operation
        iscsi-target: Fix processing of OOO commands
        iscsi-target: Make buf param of iscsit_do_crypto_hash_buf() const void *
        iscsi-target: Fix NULL pointer dereference in iscsit_send_reject
        target: Have dev/enable show if TCM device is configured
        target: Use FD_MAX_SECTORS/FD_BLOCKSIZE for blockdevs using fileio
        target: Remove unused struct members in se_dev_entry
      5c64e3a4
    • Rafael J. Wysocki's avatar
      Merge branch 'acpi-fixes' · 49a9e431
      Rafael J. Wysocki authored
      * acpi-fixes:
        ACPI / scan: Fix memory leak on acpi_scan_init_hotplug() error path
      49a9e431
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-cpufreq' · e50caa95
      Rafael J. Wysocki authored
      * pm-cpufreq:
        cpufreq: Preserve sysfs files across suspend/resume
      e50caa95
    • David Henningsson's avatar
      ALSA: hda - Add headset mic support for another Dell machine · 436c4a0c
      David Henningsson authored
      
      
      BugLink: https://bugs.launchpad.net/bugs/1180351
      Signed-off-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      436c4a0c
    • Michael Ellerman's avatar
      ALSA: snd-aoa: Add a layout entry for PowerBook6,5 · 08857861
      Michael Ellerman authored
      Either one or a combination of commits 81e5d864
      "Register i2c devices from device-tree" and 3a3dd018
      
      
      "Improve detection of devices from device-tree" broke sound on
      PowerBook6,5 machines.
      
      Fix it by adding an entry to the new driver to match PowerBook6,5
      machines.
      
      Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
      Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      08857861
    • Takashi Iwai's avatar
      Merge tag 'asoc-v3.10-rc1' of... · 478e858b
      Takashi Iwai authored
      Merge tag 'asoc-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
      
      ASoC: Fixes for v3.10
      
      A few small driver-specific fixes, none of them especially crippling.
      478e858b
    • Takashi Iwai's avatar
      ALSA: hda - Check the activity of the NID to be powered down · b1b9fbd0
      Takashi Iwai authored
      
      
      When an inactive path is powered down with spec->power_down_unused
      flag, we should check the activity of each widget in the path whether
      it's still referred from any active path.
      
      Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
      b1b9fbd0