1. 26 2月, 2011 14 次提交
  2. 25 2月, 2011 13 次提交
  3. 24 2月, 2011 13 次提交
    • J
      x86/mrst: Fix apb timer rating when lapic timer is used · 7b62dbec
      Jacob Pan 提交于
      Need to adjust the clockevent device rating for the structure
      that will be registered with clockevent system instead of the
      temporary structure.
      
      Without this fix, APB timer rating will be higher than LAPIC
      timer such that it can not be released later to be used as the
      broadcast timer.
      Signed-off-by: NJacob Pan <jacob.jun.pan@linux.intel.com>
      Cc: Arjan van de Ven <arjan@linux.intel.com>
      Cc: Alan Cox <alan@linux.intel.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: John Stultz <john.stultz@linaro.org>
      LKML-Reference: <1298506046-439-1-git-send-email-jacob.jun.pan@linux.intel.com>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      7b62dbec
    • J
      Unlock vfsmount_lock in do_umount · bf9faa2a
      J. R. Okajima 提交于
      By the commit
      	b3e19d92 2011-01-07 fs: scale mntget/mntput
      vfsmount_lock was introduced around testing mnt_count.
      Fix the mis-typed 'unlock'
      Signed-off-by: NJ. R. Okajima <hooanon05@yahoo.co.jp>
      Acked-by: NAl Viro <viro@zeniv.linux.org.uk>
      Signed-off-by: NAl Viro <viro@zeniv.linux.org.uk>
      bf9faa2a
    • N
      md: Fix - again - partition detection when array becomes active · f0b4f7e2
      NeilBrown 提交于
      Revert
          b821eaa5
      and
          f3b99be1
      
      When I wrote the first of these I had a wrong idea about the
      lifetime of 'struct block_device'.  It can disappear at any time that
      the block device is not open if it falls out of the inode cache.
      
      So relying on the 'size' recorded with it to detect when the
      device size has changed and so we need to revalidate, is wrong.
      
      Rather, we really do need the 'changed' attribute stored directly in
      the mddev and set/tested as appropriate.
      
      Without this patch, a sequence of:
         mknod / open / close / unlink
      
      (which can cause a block_device to be created and then destroyed)
      will result in a rescan of the partition table and consequence removal
      and addition of partitions.
      Several of these in a row can get udev racing to create and unlink and
      other code can get confused.
      
      With the patch, the rescan is only performed when needed and so there
      are no races.
      
      This is suitable for any stable kernel from 2.6.35.
      Reported-by: N"Wojcik, Krzysztof" <krzysztof.wojcik@intel.com>
      Signed-off-by: NNeilBrown <neilb@suse.de>
      Cc: stable@kernel.org
      f0b4f7e2
    • N
      Fix over-zealous flush_disk when changing device size. · 93b270f7
      NeilBrown 提交于
      There are two cases when we call flush_disk.
      In one, the device has disappeared (check_disk_change) so any
      data will hold becomes irrelevant.
      In the oter, the device has changed size (check_disk_size_change)
      so data we hold may be irrelevant.
      
      In both cases it makes sense to discard any 'clean' buffers,
      so they will be read back from the device if needed.
      
      In the former case it makes sense to discard 'dirty' buffers
      as there will never be anywhere safe to write the data.  In the
      second case it *does*not* make sense to discard dirty buffers
      as that will lead to file system corruption when you simply enlarge
      the containing devices.
      
      flush_disk calls __invalidate_devices.
      __invalidate_device calls both invalidate_inodes and invalidate_bdev.
      
      invalidate_inodes *does* discard I_DIRTY inodes and this does lead
      to fs corruption.
      
      invalidate_bev *does*not* discard dirty pages, but I don't really care
      about that at present.
      
      So this patch adds a flag to __invalidate_device (calling it
      __invalidate_device2) to indicate whether dirty buffers should be
      killed, and this is passed to invalidate_inodes which can choose to
      skip dirty inodes.
      
      flusk_disk then passes true from check_disk_change and false from
      check_disk_size_change.
      
      dm avoids tripping over this problem by calling i_size_write directly
      rathher than using check_disk_size_change.
      
      md does use check_disk_size_change and so is affected.
      
      This regression was introduced by commit 608aeef1 which causes
      check_disk_size_change to call flush_disk, so it is suitable for any
      kernel since 2.6.27.
      
      Cc: stable@kernel.org
      Acked-by: NJeff Moyer <jmoyer@redhat.com>
      Cc: Andrew Patterson <andrew.patterson@hp.com>
      Cc: Jens Axboe <axboe@kernel.dk>
      Signed-off-by: NNeilBrown <neilb@suse.de>
      93b270f7
    • H
      mm: fix possible cause of a page_mapped BUG · a3e8cc64
      Hugh Dickins 提交于
      Robert Swiecki reported a BUG_ON(page_mapped) from a fuzzer, punching
      a hole with madvise(,, MADV_REMOVE).  That path is under mutex, and
      cannot be explained by lack of serialization in unmap_mapping_range().
      
      Reviewing the code, I found one place where vm_truncate_count handling
      should have been updated, when I switched at the last minute from one
      way of managing the restart_addr to another: mremap move changes the
      virtual addresses, so it ought to adjust the restart_addr.
      
      But rather than exporting the notion of restart_addr from memory.c, or
      converting to restart_pgoff throughout, simply reset vm_truncate_count
      to 0 to force a rescan if mremap move races with preempted truncation.
      
      We have no confirmation that this fixes Robert's BUG,
      but it is a fix that's worth making anyway.
      Signed-off-by: NHugh Dickins <hughd@google.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a3e8cc64
    • M
      mm: prevent concurrent unmap_mapping_range() on the same inode · 2aa15890
      Miklos Szeredi 提交于
      Michael Leun reported that running parallel opens on a fuse filesystem
      can trigger a "kernel BUG at mm/truncate.c:475"
      
      Gurudas Pai reported the same bug on NFS.
      
      The reason is, unmap_mapping_range() is not prepared for more than
      one concurrent invocation per inode.  For example:
      
        thread1: going through a big range, stops in the middle of a vma and
           stores the restart address in vm_truncate_count.
      
        thread2: comes in with a small (e.g. single page) unmap request on
           the same vma, somewhere before restart_address, finds that the
           vma was already unmapped up to the restart address and happily
           returns without doing anything.
      
      Another scenario would be two big unmap requests, both having to
      restart the unmapping and each one setting vm_truncate_count to its
      own value.  This could go on forever without any of them being able to
      finish.
      
      Truncate and hole punching already serialize with i_mutex.  Other
      callers of unmap_mapping_range() do not, and it's difficult to get
      i_mutex protection for all callers.  In particular ->d_revalidate(),
      which calls invalidate_inode_pages2_range() in fuse, may be called
      with or without i_mutex.
      
      This patch adds a new mutex to 'struct address_space' to prevent
      running multiple concurrent unmap_mapping_range() on the same mapping.
      
      [ We'll hopefully get rid of all this with the upcoming mm
        preemptibility series by Peter Zijlstra, the "mm: Remove i_mmap_mutex
        lockbreak" patch in particular.  But that is for 2.6.39 ]
      Signed-off-by: NMiklos Szeredi <mszeredi@suse.cz>
      Reported-by: NMichael Leun <lkml20101129@newton.leun.net>
      Reported-by: NGurudas Pai <gurudas.pai@oracle.com>
      Tested-by: NGurudas Pai <gurudas.pai@oracle.com>
      Acked-by: NHugh Dickins <hughd@google.com>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2aa15890
    • L
      Revert "Bluetooth: Enable USB autosuspend by default on btusb" · 78794b2c
      Linus Torvalds 提交于
      This reverts commit 556ea928.
      
      Jeff Chua reports that it can cause some bluetooth devices (he mentions
      an Bluetooth Intermec scanner) to just stop responding after a while
      with messages like
      
        [ 4533.361959] btusb 8-1:1.0: no reset_resume for driver btusb?
        [ 4533.361964] btusb 8-1:1.1: no reset_resume for driver btusb?
      
      from the kernel. See also
      
        https://bugzilla.kernel.org/show_bug.cgi?id=26182
      
      for other reports.
      Reported-by: NJeff Chua <jeff.chua.linux@gmail.com>
      Reported-by: NAndrew Meakovski <meako@bigmir.net>
      Reported-by: NJim Faulkner <jfaulkne@ccs.neu.edu>
      Acked-by: NGreg KH <gregkh@suse.de>
      Acked-by: NMatthew Garrett <mjg@redhat.com>
      Acked-by: NGustavo F. Padovan <padovan@profusion.mobi>
      Cc: stable@kernel.org (for 2.6.37)
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      78794b2c
    • D
      Merge branch 'drm-intel-fixes' of... · fbf92bea
      Dave Airlie 提交于
      Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes
      
      * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
        drm/i915: fix corruptions on i8xx due to relaxed fencing
        drm/i915: skip FDI & PCH enabling for DP_A
        agp/intel: Experiment with a 855GM GWB bit
        drm/i915: don't enable FDI & transcoder interrupts after all
        drm/i915: Ignore a hung GPU when flushing the framebuffer prior to a switch
      fbf92bea
    • D
      drm/i915: fix corruptions on i8xx due to relaxed fencing · c2e0eb16
      Daniel Vetter 提交于
      It looks like gen2 has a peculiar interleaved 2-row inter-tile
      layout. Probably inherited from i81x which had 2kb tiles (which
      naturally fit an even-number-of-tile-rows scheme to fit onto 4kb
      pages). There is no other mention of this in any docs (also not
      in the Intel internal documention according to Chris Wilson).
      
      Problem manifests itself in corruptions in the second half of the
      last tile row (if the bo has an odd number of tiles). Which can
      only happen with relaxed tiling (introduced in a00b10c3).
      
      So reject set_tiling calls that don't satisfy this constrain to
      prevent broken userspace from causing havoc. While at it, also
      check the size for newer chipsets.
      
      LKML: https://lkml.org/lkml/2011/2/19/5Reported-by: NIndan Zupancic <indan@nul.nu>
      Tested-by: NIndan Zupancic <indan@nul.nu>
      Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
      Signed-off-by: NChris Wilson <chris@chris-wilson.co.uk>
      c2e0eb16
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · ef324285
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (33 commits)
        Added support for usb ethernet (0x0fe6, 0x9700)
        r8169: fix RTL8168DP power off issue.
        r8169: correct settings of rtl8102e.
        r8169: fix incorrect args to oob notify.
        DM9000B: Fix PHY power for network down/up
        DM9000B: Fix reg_save after spin_lock in dm9000_timeout
        net_sched: long word align struct qdisc_skb_cb data
        sfc: lower stack usage in efx_ethtool_self_test
        bridge: Use IPv6 link-local address for multicast listener queries
        bridge: Fix MLD queries' ethernet source address
        bridge: Allow mcast snooping for transient link local addresses too
        ipv6: Add IPv6 multicast address flag defines
        bridge: Add missing ntohs()s for MLDv2 report parsing
        bridge: Fix IPv6 multicast snooping by correcting offset in MLDv2 report
        bridge: Fix IPv6 multicast snooping by storing correct protocol type
        p54pci: update receive dma buffers before and after processing
        fix cfg80211_wext_siwfreq lock ordering...
        rt2x00: Fix WPA TKIP Michael MIC failures.
        ath5k: Fix fast channel switching
        tcp: undo_retrans counter fixes
        ...
      ef324285
    • L
      Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · b5f7376e
      Linus Torvalds 提交于
      * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        amd64-agp: fix crash at second module load
        drm/radeon: fix regression with AA resolve checking
        drm: drop commented out code and preceding comment
        drm/vblank: Enable precise vblank timestamps for interlaced and doublescan modes.
        drm/vblank: Use memory barriers optimized for atomic_t instead of generics.
        drm/vblank: Use abs64(diff_ns) for s64 diff_ns instead of abs(diff_ns)
        drm/radeon/kms: align height of fb allocation.
        Revert "drm/radeon/kms: switch back to min->max pll post divider iteration"
      b5f7376e
    • D
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 57949e80
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: serio/gameport - use 'long' system workqueue
        Input: synaptics - document 0x0c query
        Input: tegra-kbc - add function keymap
      57949e80