1. 04 10月, 2013 1 次提交
  2. 30 9月, 2013 2 次提交
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · cac66535
      Linus Torvalds 提交于
      Pull perf revert from Ingo Molnar:
       "This fixes the 'perf top' regression Markus Trippelsdorf reported"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        Revert "perf symbols: Demangle cloned functions"
      cac66535
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · b97b869a
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Nothing too major, radeon still has some dpm changes for off by
        default.
      
        Radeon, intel, msm:
         - radeon: a few more dpm fixes (still off by default), uvd fixes
         - i915: runtime warn backtrace and regression fix
         - msm: iommu changes fallout"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (27 commits)
        drm/msm: use drm_gem_dumb_destroy helper
        drm/msm: deal with mach/iommu.h removal
        drm/msm: Remove iommu include from mdp4_kms.c
        drm/msm: Odd PTR_ERR usage
        drm/i915: Fix up usage of SHRINK_STOP
        drm/radeon: fix hdmi audio on DCE3.0/3.1 asics
        drm/i915: preserve pipe A quirk in i9xx_set_pipeconf
        drm/i915/tv: clear adjusted_mode.flags
        drm/i915/dp: increase i2c-over-aux retry interval on AUX DEFER
        drm/radeon/cik: fix overflow in vram fetch
        drm/radeon: add missing hdmi callbacks for rv6xx
        drm/i915: Use a temporary va_list for two-pass string handling
        drm/radeon/uvd: lower msg&fb buffer requirements on UVD3
        drm/radeon: disable tests/benchmarks if accel is disabled
        drm/radeon: don't set default clocks for SI when DPM is disabled
        drm/radeon/dpm/ci: filter clocks based on voltage/clk dep tables
        drm/radeon/dpm/si: filter clocks based on voltage/clk dep tables
        drm/radeon/dpm/ni: filter clocks based on voltage/clk dep tables
        drm/radeon/dpm/btc: filter clocks based on voltage/clk dep tables
        drm/radeon/dpm: fetch the max clk from voltage dep tables helper
        ...
      b97b869a
  3. 29 9月, 2013 12 次提交
  4. 28 9月, 2013 22 次提交
    • J
      i2c: ismt: initialize DMA buffer · bf416910
      James Ralston 提交于
      This patch adds code to initialize the DMA buffer to compensate for
      possible hardware data corruption.
      Signed-off-by: NJames Ralston <james.d.ralston@intel.com>
      [wsa: changed to use 'sizeof']
      Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
      bf416910
    • R
      drm/msm: use drm_gem_dumb_destroy helper · 30600a90
      Rob Clark 提交于
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      30600a90
    • R
      drm/msm: deal with mach/iommu.h removal · 33b55963
      Rob Clark 提交于
      We still need an API exported by msm iommu driver (but not visible in
      any public header anymore).  For now, just declare the prototype
      ourselves, but when msm iommu driver provides a better option, use that
      instead.
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      33b55963
    • I
      perf/x86: Fix PMU detection printout when no PMU is detected · 8a3da6c7
      Ingo Molnar 提交于
      Ran into this cryptic PMU bootup log recently:
      
      [    0.124047] Performance Events:
      [    0.125000] smpboot: ...
      
      Turns out we print this if no PMU is detected. Fall back to
      the right condition so that the following is printed:
      
      [    0.122381] Performance Events: no PMU driver, software events only.
      
      Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
      Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
      Link: http://lkml.kernel.org/n/tip-u2fwaUffakjp0qkpRfqljgsn@git.kernel.orgSigned-off-by: NIngo Molnar <mingo@kernel.org>
      8a3da6c7
    • J
      drm/msm: Remove iommu include from mdp4_kms.c · c55d1c41
      Joerg Roedel 提交于
      The include file has been removed and the file does not
      need it anyway, so remove it. Fixes a compile error.
      Signed-off-by: NJoerg Roedel <joro@8bytes.org>
      Signed-off-by: NRob Clark <robdclark@gmail.com>
      c55d1c41
    • T
      drm/msm: Odd PTR_ERR usage · e4826a94
      Thomas Meyer 提交于
      The variable priv->kms is not initialized yet.
      
      Found by "scripts/coccinelle/tests/odd_ptr_err.cocci".
      PTR_ERR should access the value just tested by IS_ERR.
      Signed-off-by: NThomas Meyer <thomas@m3y3r.de>
      e4826a94
    • H
      s390: enable ARCH_USE_CMPXCHG_LOCKREF · efc1d23b
      Heiko Carstens 提交于
      Enable ARCH_USE_CMPXCHG_LOCKREF since it shows performance improvements
      with Linus' simple stat() test case of up to 50% on a 30 cpu system.
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      efc1d23b
    • H
      lockref: use arch_mutex_cpu_relax() in CMPXCHG_LOOP() · 491f6f8e
      Heiko Carstens 提交于
      Make use of arch_mutex_cpu_relax() so architectures can override the
      default cpu_relax() semantics.
      This is especially useful for s390, where cpu_relax() means that we
      yield() the current (virtual) cpu and therefore is very expensive,
      and would contradict the whole purpose of the lockless cmpxchg loop.
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      491f6f8e
    • H
      mutex: replace CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX with simple ifdef · 083986e8
      Heiko Carstens 提交于
      Linus suggested to replace
      
       #ifndef CONFIG_HAVE_ARCH_MUTEX_CPU_RELAX
       #define arch_mutex_cpu_relax() cpu_relax()
       #endif
      
      with just a simple
      
        #ifndef arch_mutex_cpu_relax
        # define arch_mutex_cpu_relax() cpu_relax()
        #endif
      
      to get rid of CONFIG_HAVE_CPU_RELAX_SIMPLE. So architectures can
      simply define arch_mutex_cpu_relax if they want an architecture
      specific function instead of having to add a select statement in
      their Kconfig in addition.
      Suggested-by: NLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      083986e8
    • I
      Merge branch 'context_tracking/fixes' of... · 62d08aec
      Ingo Molnar 提交于
      Merge branch 'context_tracking/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into sched/urgent
      
      Pull context tracking ARM fix from Frederic Weisbecker.
      Signed-off-by: NIngo Molnar <mingo@kernel.org>
      62d08aec
    • D
      Merge branch 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes · 41ed7fe9
      Dave Airlie 提交于
      More radeon fixes for 3.12.  Kind of all over the place: UVD, DPM,
      tiling, etc.
      
      * 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux:
        drm/radeon: fix hdmi audio on DCE3.0/3.1 asics
        drm/radeon/cik: fix overflow in vram fetch
        drm/radeon: add missing hdmi callbacks for rv6xx
        drm/radeon/uvd: lower msg&fb buffer requirements on UVD3
        drm/radeon: disable tests/benchmarks if accel is disabled
        drm/radeon: don't set default clocks for SI when DPM is disabled
        drm/radeon/dpm/ci: filter clocks based on voltage/clk dep tables
        drm/radeon/dpm/si: filter clocks based on voltage/clk dep tables
        drm/radeon/dpm/ni: filter clocks based on voltage/clk dep tables
        drm/radeon/dpm/btc: filter clocks based on voltage/clk dep tables
        drm/radeon/dpm: fetch the max clk from voltage dep tables helper
        drm/radeon: fix missed variable sized access
        drm/radeon: Make r100_cp_ring_info() and radeon_ring_gfx() safe (v2)
        drm/radeon/cik: Add tiling mode index for 1D tiled depth/stencil surfaces
        drm/radeon/cik: Fix encoding of number of banks in tiling configuration info
        drm/radeon/cik: Fix printing of client name on VM protection fault
        drm/radeon: additional gcc fixes for radeon_atombios.c
        drm/radeon: avoid UVD corruption on AGP cards using GPU gart
      41ed7fe9
    • D
      Merge tag 'drm-intel-fixes-2013-09-26' of... · 36dec40c
      Dave Airlie 提交于
      Merge tag 'drm-intel-fixes-2013-09-26' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
      
      Just a few fixes for regressions and other serious stuff.
      
      Two fix state tracking mismatches, together with an additional patch that
      I've submitted to stable (somehow forgotten to tag it) we should have them
      fixed now (I hope).
      
      * tag 'drm-intel-fixes-2013-09-26' of git://people.freedesktop.org/~danvet/drm-intel:
        drm/i915: Fix up usage of SHRINK_STOP
        drm/i915: preserve pipe A quirk in i9xx_set_pipeconf
        drm/i915/tv: clear adjusted_mode.flags
        drm/i915/dp: increase i2c-over-aux retry interval on AUX DEFER
        drm/i915: Use a temporary va_list for two-pass string handling
      36dec40c
    • L
      Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging · 6cac446b
      Linus Torvalds 提交于
      Pull hwmon fix from Guenter Roeck:
       "Fix potential crash condition in applesmc driver"
      
      * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (applesmc) Check key count before proceeding
      6cac446b
    • L
      Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · a7301fcc
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Nothing too serious here: a couple of compress-offload core fixes,
        Haswell HDMI audio fix, a fixup for new MacBook Airs and a few COEF
        setups for ALC283 mic problems"
      
      * tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Enable internal mic on a Thinkpad machine with ALC283
        ALSA: hda - Fix Internal Mic boost can't control with ALC283
        ALSA: hda - Add documentation for CS4208 fixups
        ALSA: hda - Add fixup for MacBook Air 6,1 and 6,2 with CS4208 codec
        ALSA : hda - not use assigned converters for all unused pins
        ALSA: compress: Make sure we trigger STOP before closing the stream.
        ALSA: compress: Fix compress device unregister.
      a7301fcc
    • L
      Merge tag 'fbdev-fixes-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · d3aa0269
      Linus Torvalds 提交于
      Pull fbdev fixes from Tomi Valkeinen:
       "Small fbdev fixes for various fb drivers"
      
      * tag 'fbdev-fixes-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        video: mxsfb: Add missing break
        video: of: display_timing: correct display-timings node finding
        neofb: fix error return code in neofb_probe()
        s3fb: fix error return code in s3_pci_probe()
        video: mmp: drop needless devm cleanup
        OMAPDSS: Add missing dependency on backlight for DSI-CM panel drier
        OMAPDSS: DISPC: set irq_safe for runtime PM
        OMAPDSS: Return right error during connector probe
      d3aa0269
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · e1f8826f
      Linus Torvalds 提交于
      Pull reiserfs and UDF fixes from Jan Kara:
       "The contains fix of an UDF oops when mounting corrupted media and a
        fix of a race in reiserfs leading to oops"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        reiserfs: fix race with flush_used_journal_lists and flush_journal_list
        reiserfs: remove useless flush_old_journal_lists
        udf: Fortify LVID loading
      e1f8826f
    • E
      sysfs: Allow mounting without CONFIG_NET · 730d7d33
      Eric W. Biederman 提交于
      In kobj_ns_current_may_mount the default should be to allow the mount.
      The test is only for a single kobj_ns_type at a time, and unless there
      is a reason to prevent it the mounting sysfs should be allowed.
      Subsystems that are not registered can't have are not involved so can't
      have a reason to prevent mounting sysfs.
      
      This is a bug-fix to commit 7dc5dbc8 ("sysfs: Restrict mounting
      sysfs") that came in via the userns tree during the 3.12 merge window.
      Reported-and-tested-by: NJames Hogan <james.hogan@imgtec.com>
      Signed-off-by: N"Eric W. Biederman" <ebiederm@xmission.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      730d7d33
    • W
      lockref: allow relaxed cmpxchg64 variant for lockless updates · d2212b4d
      Will Deacon 提交于
      The 64-bit cmpxchg operation on the lockref is ordered by virtue of
      hazarding between the cmpxchg operation and the reference count
      manipulation. On weakly ordered memory architectures (such as ARM), it
      can be of great benefit to omit the barrier instructions where they are
      not needed.
      
      This patch moves the lockless lockref code over to a cmpxchg64_relaxed
      operation, which doesn't provide barrier semantics. If the operation
      isn't defined, we simply #define it as the usual 64-bit cmpxchg macro.
      
      Cc: Waiman Long <Waiman.Long@hp.com>
      Signed-off-by: NWill Deacon <will.deacon@arm.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d2212b4d
    • C
      i2c: designware: 10-bit addressing mode enabling if I2C_DYNAMIC_TAR_UPDATE is set · bd63ace4
      Chew, Chiau Ee 提交于
      According to Designware I2C spec, if I2C_DYNAMIC_TAR_UPDATE is set to 1,
      the 10-bit addressing mode is controlled by IC_10BITADDR_MASTER bit of
      IC_TAR register instead of IC_CON register. The IC_10BITADDR_MASTER
      in IC_CON register becomes read-only copy. Since I2C_DYNAMIC_TAR_UPDATE
      value can't be detected from hardware register, so we will always set the
      IC_10BITADDR_MASTER bit in both IC_CON and IC_TAR register whenever 10-bit
      addresing mode is requested by user application.
      Signed-off-by: NChew, Chiau Ee <chiau.ee.chew@intel.com>
      Reviewed-by: NMika Westerberg <mika.westerberg@linux.intel.com>
      Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
      bd63ace4
    • T
      i2c: mv64xxx: Do not use writel_relaxed() · 85b3a935
      Thierry Reding 提交于
      The driver is used on PowerPC which don't provide writel_relaxed(). This
      breaks the c2k and prpmc2800 default configurations. To fix the build,
      turn the calls to writel_relaxed() into writel(). The impacts for ARM
      should be minimal.
      Signed-off-by: NThierry Reding <treding@nvidia.com>
      Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
      85b3a935
    • T
      i2c: mv64xxx: Fix some build warnings · c1a99467
      Thierry Reding 提交于
      Some functions and variables are only used if the configuration selects
      HAVE_CLK. Protect them with a corresponding #ifdef CONFIG_HAVE_CLK block
      to avoid compiler warnings.
      Signed-off-by: NThierry Reding <treding@nvidia.com>
      [wsa: added marker to #endif]
      Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
      c1a99467
    • K
      i2c: s3c2410: fix clk_disable/clk_unprepare WARNings · 15336913
      Kim Phillips 提交于
      commit d16933b3 "i2c: s3c2410: Move
      location of clk_prepare_enable() call in probe function" refactored
      clk_enable and clk_disable calls yet neglected to remove the
      clk_disable_unprepare call in the module's remove().
      
      It helps remove warnings on an arndale during unbind:
      
      echo 12c90000.i2c > /sys/bus/platform/devices/12c90000.i2c/driver/unbind
      
      ------------[ cut here ]------------
      WARNING: CPU: 0 PID: 2548 at drivers/clk/clk.c:842 clk_disable+0x18/0x24()
      Modules linked in:
      CPU: 0 PID: 2548 Comm: bash Not tainted 3.11.0-next-20130916-00003-gf4bddbc #6
      [<c0014d48>] (unwind_backtrace+0x0/0xf8) from [<c00117d0>] (show_stack+0x10/0x14)
      [<c00117d0>] (show_stack+0x10/0x14) from [<c0361be8>] (dump_stack+0x6c/0xac)
      [<c0361be8>] (dump_stack+0x6c/0xac) from [<c001d864>] (warn_slowpath_common+0x64/0x88)
      [<c001d864>] (warn_slowpath_common+0x64/0x88) from [<c001d8a4>] (warn_slowpath_null+0x1c/0x24)
      [<c001d8a4>] (warn_slowpath_null+0x1c/0x24) from [<c02c4a64>] (clk_disable+0x18/0x24)
      [<c02c4a64>] (clk_disable+0x18/0x24) from [<c028d0b0>] (s3c24xx_i2c_remove+0x28/0x70)
      [<c028d0b0>] (s3c24xx_i2c_remove+0x28/0x70) from [<c0217a10>] (platform_drv_remove+0x18/0x1c)
      [<c0217a10>] (platform_drv_remove+0x18/0x1c) from [<c0216358>] (__device_release_driver+0x58/0xb4)
      [<c0216358>] (__device_release_driver+0x58/0xb4) from [<c02163d0>] (device_release_driver+0x1c/0x28)
      [<c02163d0>] (device_release_driver+0x1c/0x28) from [<c02153c0>] (unbind_store+0x58/0x90)
      [<c02153c0>] (unbind_store+0x58/0x90) from [<c0214c90>] (drv_attr_store+0x20/0x2c)
      [<c0214c90>] (drv_attr_store+0x20/0x2c) from [<c01032c0>] (sysfs_write_file+0x168/0x198)
      [<c01032c0>] (sysfs_write_file+0x168/0x198) from [<c00ae1c0>] (vfs_write+0xb0/0x194)
      [<c00ae1c0>] (vfs_write+0xb0/0x194) from [<c00ae594>] (SyS_write+0x3c/0x70)
      [<c00ae594>] (SyS_write+0x3c/0x70) from [<c000e3e0>] (ret_fast_syscall+0x0/0x30)
      ---[ end trace 4c9f9403066f57a6 ]---
      ------------[ cut here ]------------
      WARNING: CPU: 0 PID: 2548 at drivers/clk/clk.c:751 clk_unprepare+0x14/0x1c()
      Modules linked in:
      CPU: 0 PID: 2548 Comm: bash Tainted: G        W    3.11.0-next-20130916-00003-gf4bddbc #6
      [<c0014d48>] (unwind_backtrace+0x0/0xf8) from [<c00117d0>] (show_stack+0x10/0x14)
      [<c00117d0>] (show_stack+0x10/0x14) from [<c0361be8>] (dump_stack+0x6c/0xac)
      [<c0361be8>] (dump_stack+0x6c/0xac) from [<c001d864>] (warn_slowpath_common+0x64/0x88)
      [<c001d864>] (warn_slowpath_common+0x64/0x88) from [<c001d8a4>] (warn_slowpath_null+0x1c/0x24)
      [<c001d8a4>] (warn_slowpath_null+0x1c/0x24) from [<c02c5834>] (clk_unprepare+0x14/0x1c)
      [<c02c5834>] (clk_unprepare+0x14/0x1c) from [<c028d0b8>] (s3c24xx_i2c_remove+0x30/0x70)
      [<c028d0b8>] (s3c24xx_i2c_remove+0x30/0x70) from [<c0217a10>] (platform_drv_remove+0x18/0x1c)
      [<c0217a10>] (platform_drv_remove+0x18/0x1c) from [<c0216358>] (__device_release_driver+0x58/0xb4)
      [<c0216358>] (__device_release_driver+0x58/0xb4) from [<c02163d0>] (device_release_driver+0x1c/0x28)
      [<c02163d0>] (device_release_driver+0x1c/0x28) from [<c02153c0>] (unbind_store+0x58/0x90)
      [<c02153c0>] (unbind_store+0x58/0x90) from [<c0214c90>] (drv_attr_store+0x20/0x2c)
      [<c0214c90>] (drv_attr_store+0x20/0x2c) from [<c01032c0>] (sysfs_write_file+0x168/0x198)
      [<c01032c0>] (sysfs_write_file+0x168/0x198) from [<c00ae1c0>] (vfs_write+0xb0/0x194)
      [<c00ae1c0>] (vfs_write+0xb0/0x194) from [<c00ae594>] (SyS_write+0x3c/0x70)
      [<c00ae594>] (SyS_write+0x3c/0x70) from [<c000e3e0>] (ret_fast_syscall+0x0/0x30)
      ---[ end trace 4c9f9403066f57a7 ]---
      Signed-off-by: NKim Phillips <kim.phillips@linaro.org>
      Signed-off-by: NWolfram Sang <wsa@the-dreams.de>
      15336913
  5. 27 9月, 2013 3 次提交