1. 25 10月, 2012 3 次提交
  2. 24 10月, 2012 22 次提交
  3. 23 10月, 2012 15 次提交
    • C
      arch/tile: avoid build warnings from duplicate ELF_R_xxx #defines · 78059633
      Chris Metcalf 提交于
      These are now provided in <asm-generic/module.h>, so clean up warnings
      by not re-defining them in module.c.
      Signed-off-by: NChris Metcalf <cmetcalf@tilera.com>
      Acked-by: NRusty Russell <rusty@rustcorp.com.au>
      78059633
    • C
      arch/tile: avoid generating .eh_frame information in modules · 627072b0
      Chris Metcalf 提交于
      The tile tool chain uses the .eh_frame information for backtracing.
      The vmlinux build drops any .eh_frame sections at link time, but when
      present in kernel modules, it causes a module load failure due to the
      presence of unsupported pc-relative relocations.  When compiling to
      use compiler feedback support, the compiler by default omits .eh_frame
      information, so we don't see this problem.  But when not using feedback,
      we need to explicitly suppress the .eh_frame.
      Signed-off-by: NChris Metcalf <cmetcalf@tilera.com>
      Cc: stable@vger.kernel.org
      627072b0
    • L
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 2d1f4c8e
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Fixes for intel and nouveau mainly.
      
         - intel: disable HSW by default, sdvo fixes, link train regression
           fix
         - nouveau: acpi rom loading regression fix, with a few other fixes
           from the rework
         -core: just other minor fixes and race fixes for ttm."
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (24 commits)
        drm/ttm: Fix a theoretical race in ttm_bo_cleanup_refs()
        drm/ttm: Fix a theoretical race
        drm: platform: Don't initialize driver-private data
        drm/debugfs: remove redundant info from gem_names
        drm: fb: cma: Fail gracefully on allocation failure
        drm: fb: cma: Fix typo in debug message
        drm/nouveau/clock: fix missing pll type/addr when matching default entry
        drm/nouveau/fb: fix reporting of memory type on GF8+ IGPs
        drm/nv41/vm: don't init hw pciegart on boards with agp bridge
        drm/nouveau/bios: fetch full 4KiB block to determine ACPI ROM image size
        drm/nouveau: validate vbios size
        drm/nouveau: warn when trying to free mm which is still in use
        drm/nouveau: fix nouveau_mm/nouveau_mm_node leak
        drm/nouveau/bios: improve error handling when reading the vbios from ACPI
        drm/nouveau: handle same-fb page flips
        drm/i915: Initialize obj->pages before use by i915_gem_object_do_bit17_swizzle()
        drm/i915: Add no-lvds quirk for Supermicro X7SPA-H
        drm/i915: Insert i915_preliminary_hw_support variable.
        drm/i915: shut up spurious WARN in the gtt fault handler
        Revert "drm/i915: Try harder to complete DP training pattern 1"
        ...
      2d1f4c8e
    • L
      Merge tag 'jfs-3.7-2' of git://github.com/kleikamp/linux-shaggy · d888af96
      Linus Torvalds 提交于
      Pull jfs fix from Dave Kleikamp:
       "Bug fix: Fix FITRIM argument handling"
      
      * tag 'jfs-3.7-2' of git://github.com/kleikamp/linux-shaggy:
        jfs: Fix FITRIM argument handling
      d888af96
    • L
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · e589db7a
      Linus Torvalds 提交于
      Pull ext4 fixes from Ted Ts'o:
       "Various bug fixes for ext4.  The most serious of them fixes a security
        bug (CVE-2012-4508) which leads to stale data exposure when we have
        fallocate racing against writes to files undergoing delayed
        allocation.  We also have two fixes for the metadata checksum feature,
        the most serious of which can cause the superblock to have a invalid
        checksum after a power failure."
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: Avoid underflow in ext4_trim_fs()
        ext4: Checksum the block bitmap properly with bigalloc enabled
        ext4: fix undefined bit shift result in ext4_fill_flex_info
        ext4: fix metadata checksum calculation for the superblock
        ext4: race-condition protection for ext4_convert_unwritten_extents_endio
        ext4: serialize fallocate with ext4_convert_unwritten_extents
      e589db7a
    • L
      Merge tag 'nfs-for-3.7-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 344ba37b
      Linus Torvalds 提交于
      Pull NFS client bugfixes from Trond Myklebust:
       - Do not call pnfs_return_layout() from an rpciod context
       - nfs4_ds_disconnect can cause Oopses.  Kill it...
       - Fix the return value for nfs_callback_start_svc
       - Fix a number of compile warnings
      
      * tag 'nfs-for-3.7-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFSv4: Fix the return value for nfs_callback_start_svc
        NFSv4.1: Declare osd_pri_2_pnfs_err(), objio_init_read/write to be static
        NFSv4: fs/nfs/nfs4getroot.c needs to include "internal.h"
        NFSv4.1: Use kcalloc() to allocate zeroed arrays instead of kzalloc()
        NFSv4.1: Do not call pnfs_return_layout() from an rpciod context
        NFSv4.1: Kill nfs4_ds_disconnect()
      344ba37b
    • L
      Merge tag 'regmap-fix-mmio' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · c52f1dd5
      Linus Torvalds 提交于
      Pull regmap fix from Mark Brown:
       "regmap: Fix for dependencies for MMIO
      
        Trivial dependency issue, not noticed before as the only user of MMIO
        also needs I2C."
      
      * tag 'regmap-fix-mmio' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: select REGMAP if REGMAP_MMIO and REGMAP_IRQ enabled
      c52f1dd5
    • T
      drm/ttm: Fix a theoretical race in ttm_bo_cleanup_refs() · b8e902f2
      Thomas Hellstrom 提交于
      In theory, that function could release the lru lock between
      checking for bo on ddestroy list and a successful reserve if the bo
      was already reserved, and the function was called with waiting reserves
      allowed.
      However, all current reservers of a bo on the ddestroy list would
      atomically take the bo off the list after a successful reserve so this
      race should not have been hit, so no need to backport for stable.
      
      This patch also fixes a case found by Maarten Lankhorst where
      ttm_mem_evict_first called with no_wait_gpu would incorrectly
      spin waiting for bo idle if trying to evict a busy buffer that
      also sits on the ddestroy list.
      Signed-off-by: NThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      b8e902f2
    • T
      drm/ttm: Fix a theoretical race · 7bc17a78
      Thomas Hellstrom 提交于
      The ttm_mem_evict_first function could theoretically drop the
      lru lock without retrying if a reservation from off the LRU list
      ended up waiting.
      However, since currently there are no users that could cause a wait
      in that situation so this is not suitable for stable
      Signed-off-by: NThomas Hellstrom <thellstrom@vmware.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      7bc17a78
    • T
      drm: platform: Don't initialize driver-private data · a16d4f86
      Thierry Reding 提交于
      Platform device drivers usually use the driver-private data for their
      own purposes. Having it overwritten by drm_platform_init() is confusing
      and error-prone.
      Signed-off-by: NThierry Reding <thierry.reding@avionic-design.de>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      a16d4f86
    • M
      drm/debugfs: remove redundant info from gem_names · 08bce0ac
      Marcin Slusarz 提交于
      It's a relic of "drm: Convert proc files to seq_file and introduce debugfs",
      which wrongly converted DRM_INFO + sprintf to 2 seq_printfs.
      Signed-off-by: NMarcin Slusarz <marcin.slusarz@gmail.com>
      Cc: Ben Gamari <bgamari@gmail.com>
      Cc: Eric Anholt <eric@anholt.net>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      08bce0ac
    • T
      drm: fb: cma: Fail gracefully on allocation failure · 02813245
      Thierry Reding 提交于
      The drm_gem_cma_create() function never returns NULL but rather an error
      encoded in the return value using the ERR_PTR() macro. Callers therefore
      need to check for errors using the IS_ERR() macro. This change allows
      drivers to handle contiguous DMA allocation failures gracefully.
      Signed-off-by: NThierry Reding <thierry.reding@avionic-design.de>
      Acked-by: NSascha Hauer <s.hauer@pengutronix.de>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      02813245
    • T
      drm: fb: cma: Fix typo in debug message · e0d78d08
      Thierry Reding 提交于
      The debug message showing the resolution of a framebuffer to be
      allocated is missing a closing parenthesis.
      Signed-off-by: NThierry Reding <thierry.reding@avionic-design.de>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      e0d78d08
    • L
      ext4: Avoid underflow in ext4_trim_fs() · 5de35e8d
      Lukas Czerner 提交于
      Currently if len argument in ext4_trim_fs() is smaller than one block,
      the 'end' variable underflow. Avoid that by returning EINVAL if len is
      smaller than file system block.
      
      Also remove useless unlikely().
      Signed-off-by: NLukas Czerner <lczerner@redhat.com>
      Signed-off-by: N"Theodore Ts'o" <tytso@mit.edu>
      Cc: stable@vger.kernel.org
      5de35e8d
    • S
      KVM guest: exit idleness when handling KVM_PV_REASON_PAGE_NOT_PRESENT · c5e015d4
      Sasha Levin 提交于
      KVM_PV_REASON_PAGE_NOT_PRESENT kicks cpu out of idleness, but we haven't
      marked that spot as an exit from idleness.
      
      Not doing so can cause RCU warnings such as:
      
      [  732.788386] ===============================
      [  732.789803] [ INFO: suspicious RCU usage. ]
      [  732.790032] 3.7.0-rc1-next-20121019-sasha-00002-g6d8d02d-dirty #63 Tainted: G        W
      [  732.790032] -------------------------------
      [  732.790032] include/linux/rcupdate.h:738 rcu_read_lock() used illegally while idle!
      [  732.790032]
      [  732.790032] other info that might help us debug this:
      [  732.790032]
      [  732.790032]
      [  732.790032] RCU used illegally from idle CPU!
      [  732.790032] rcu_scheduler_active = 1, debug_locks = 1
      [  732.790032] RCU used illegally from extended quiescent state!
      [  732.790032] 2 locks held by trinity-child31/8252:
      [  732.790032]  #0:  (&rq->lock){-.-.-.}, at: [<ffffffff83a67528>] __schedule+0x178/0x8f0
      [  732.790032]  #1:  (rcu_read_lock){.+.+..}, at: [<ffffffff81152bde>] cpuacct_charge+0xe/0x200
      [  732.790032]
      [  732.790032] stack backtrace:
      [  732.790032] Pid: 8252, comm: trinity-child31 Tainted: G        W    3.7.0-rc1-next-20121019-sasha-00002-g6d8d02d-dirty #63
      [  732.790032] Call Trace:
      [  732.790032]  [<ffffffff8118266b>] lockdep_rcu_suspicious+0x10b/0x120
      [  732.790032]  [<ffffffff81152c60>] cpuacct_charge+0x90/0x200
      [  732.790032]  [<ffffffff81152bde>] ? cpuacct_charge+0xe/0x200
      [  732.790032]  [<ffffffff81158093>] update_curr+0x1a3/0x270
      [  732.790032]  [<ffffffff81158a6a>] dequeue_entity+0x2a/0x210
      [  732.790032]  [<ffffffff81158ea5>] dequeue_task_fair+0x45/0x130
      [  732.790032]  [<ffffffff8114ae29>] dequeue_task+0x89/0xa0
      [  732.790032]  [<ffffffff8114bb9e>] deactivate_task+0x1e/0x20
      [  732.790032]  [<ffffffff83a67c29>] __schedule+0x879/0x8f0
      [  732.790032]  [<ffffffff8117e20d>] ? trace_hardirqs_off+0xd/0x10
      [  732.790032]  [<ffffffff810a37a5>] ? kvm_async_pf_task_wait+0x1d5/0x2b0
      [  732.790032]  [<ffffffff83a67cf5>] schedule+0x55/0x60
      [  732.790032]  [<ffffffff810a37c4>] kvm_async_pf_task_wait+0x1f4/0x2b0
      [  732.790032]  [<ffffffff81139e50>] ? abort_exclusive_wait+0xb0/0xb0
      [  732.790032]  [<ffffffff81139c25>] ? prepare_to_wait+0x25/0x90
      [  732.790032]  [<ffffffff810a3a66>] do_async_page_fault+0x56/0xa0
      [  732.790032]  [<ffffffff83a6a6e8>] async_page_fault+0x28/0x30
      Signed-off-by: NSasha Levin <sasha.levin@oracle.com>
      Acked-by: NGleb Natapov <gleb@redhat.com>
      Acked-by: NPaul E. McKenney <paulmck@linux.vnet.ibm.com>
      Signed-off-by: NAvi Kivity <avi@redhat.com>
      c5e015d4