Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Aug 23, 2010
  1. @torvalds

    Linux 2.6.36-rc2

    torvalds authored
Commits on Aug 22, 2010
  1. @torvalds

    Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/vir…

    torvalds authored
    …t/kvm/kvm
    
    * 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: PIT: free irq source id in handling error path
      KVM: destroy workqueue on kvm_create_pit() failures
      KVM: fix poison overwritten caused by using wrong xstate size
  2. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/anholt/drm-intel
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (58 commits)
      drm/i915,intel_agp: Add support for Sandybridge D0
      drm/i915: fix render pipe control notify on sandybridge
      agp/intel: set 40-bit dma mask on Sandybridge
      drm/i915: Remove the conflicting BUG_ON()
      drm/i915/suspend: s/IS_IRONLAKE/HAS_PCH_SPLIT/
      drm/i915/suspend: Flush register writes before busy-waiting.
      i915: disable DAC on Ironlake also when doing CRT load detection.
      drm/i915: wait for actual vblank, not just 20ms
      drm/i915: make sure eDP PLL is enabled at the right time
      drm/i915: fix VGA plane disable for Ironlake+
      drm/i915: eDP mode set sequence corrections
      drm/i915: add panel reset workaround
      drm/i915: Enable RC6 on Ironlake.
      drm/i915/sdvo: Only set is_lvds if we have a valid fixed mode.
      drm/i915: Set up a render context on Ironlake
      drm/i915 invalidate indirect state pointers at end of ring exec
      drm/i915: Wake-up wait_request() from elapsed hang-check (v2)
      drm/i915: Apply i830 errata for cursor alignment
      drm/i915: Only update i845/i865 CURBASE when disabled (v2)
      drm/i915: FBC is updated within set_base() so remove second call in mode_set()
      ...
  3. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/penberg/slab-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
      slab: fix object alignment
      slub: add missing __percpu markup in mm/slub_def.h
  4. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/ryusuke/nilfs2
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2:
      nilfs2: wait for discard to finish
  5. @anholt

    drm/i915,intel_agp: Add support for Sandybridge D0

    Zhenyu Wang authored anholt committed
    Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
  6. @anholt

    drm/i915: fix render pipe control notify on sandybridge

    Zhenyu Wang authored anholt committed
    This one is missed in last pipe control fix for sandybridge,
    that really unmask interrupt bit for notify in render engine IMR.
    
    Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
  7. @anholt

    agp/intel: set 40-bit dma mask on Sandybridge

    Zhenyu Wang authored anholt committed
    Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
  8. @ickle @anholt

    drm/i915: Remove the conflicting BUG_ON()

    ickle authored anholt committed
    We now attempt to free "active" objects following a GPU hang as either
    the GPU will be reset or the hang is permenant. In either case, the GPU
    writes will not be flushed to main memory and it should be safe to
    return that memory back to the system.
    
    The BUG_ON(active) is thus overkill and can erroneously fire after a
    EIO.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Eric Anholt <eric@anholt.net>
  9. @ickle @anholt

    drm/i915/suspend: s/IS_IRONLAKE/HAS_PCH_SPLIT/

    ickle authored anholt committed
    For the shared paths on the next generation chipsets.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Eric Anholt <eric@anholt.net>
  10. @ickle @anholt

    drm/i915/suspend: Flush register writes before busy-waiting.

    ickle authored anholt committed
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Eric Anholt <eric@anholt.net>
  11. @anholt

    i915: disable DAC on Ironlake also when doing CRT load detection.

    Dave Airlie authored anholt committed
    Like on Sandybridge, disabling the DAC here when doing CRT load detect
    avoids forever hangs waiting on the hardware.
    
    test procedure on HP 2740p:
    boot with no VGA plugged in, start X,
    plug in VGA monitor (1280x1024)
    chvt 3
    machine hangs waiting forever.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Eric Anholt <eric@anholt.net>
  12. @anholt

    drm/i915: wait for actual vblank, not just 20ms

    Jesse Barnes authored anholt committed
    Waiting for a hard coded 20ms isn't always enough to make sure a vblank
    period has actually occurred, so add code to make sure we really have
    passed through a vblank period (or that the pipe is off when disabling).
    
    This prevents problems with mode setting and link training, and seems to
    fix a bug like https://bugs.freedesktop.org/show_bug.cgi?id=29278, but
    on an HP 8440p instead.  Hopefully also fixes
    https://bugs.freedesktop.org/show_bug.cgi?id=29141.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Eric Anholt <eric@anholt.net>
Commits on Aug 21, 2010
  1. @fenrus75 @torvalds

    workqueue: Add basic tracepoints to track workqueue execution

    fenrus75 authored torvalds committed
    With the introduction of the new unified work queue thread pools,
    we lost one feature: It's no longer possible to know which worker
    is causing the CPU to wake out of idle. The result is that PowerTOP
    now reports a lot of "kworker/a:b" instead of more readable results.
    
    This patch adds a pair of tracepoints to the new workqueue code,
    similar in style to the timer/hrtimer tracepoints.
    
    With this pair of tracepoints, the next PowerTOP can correctly
    report which work item caused the wakeup (and how long it took):
    
    Interrupt (43)            i915      time   3.51ms    wakeups 141
    Work      ieee80211_iface_work      time   0.81ms    wakeups  29
    Work              do_dbs_timer      time   0.55ms    wakeups  24
    Process                   Xorg      time  21.36ms    wakeups   4
    Timer    sched_rt_period_timer      time   0.01ms    wakeups   1
    
    Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  2. @torvalds

    Merge git://git.infradead.org/mtd-2.6

    torvalds authored
    * git://git.infradead.org/mtd-2.6:
      mtd: nand: Fix probe of Samsung NAND chips
      mtd: nand: Fix regression in BBM detection
      pxa3xx: fix ns2cycle equation
  3. @sthibaul @torvalds

    Replace Configure with Enable in description of MAXSMP

    sthibaul authored torvalds committed
    The "Configure" word tends to make user believe they have to say 'yes'
    to be able to choose the number of procs/nodes.  "Enable" should be
    unambiguous enough.
    
    Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @torvalds

    mm: make stack guard page logic use vm_prev pointer

    torvalds authored
    Like the mlock() change previously, this makes the stack guard check
    code use vma->vm_prev to see what the mapping below the current stack
    is, rather than have to look it up with find_vma().
    
    Also, accept an abutting stack segment, since that happens naturally if
    you split the stack with mlock or mprotect.
    
    Tested-by: Ian Campbell <ijc@hellion.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    mm: make the mlock() stack guard page checks stricter

    torvalds authored
    If we've split the stack vma, only the lowest one has the guard page.
    Now that we have a doubly linked list of vma's, checking this is trivial.
    
    Tested-by: Ian Campbell <ijc@hellion.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    mm: make the vma list be doubly linked

    torvalds authored
    It's a really simple list, and several of the users want to go backwards
    in it to find the previous vma.  So rather than have to look up the
    previous entry with 'find_vma_prev()' or something similar, just make it
    doubly linked instead.
    
    Tested-by: Ian Campbell <ijc@hellion.org.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Aug 20, 2010
  1. @dwmw2

    mtd: nand: Fix probe of Samsung NAND chips

    Tilman Sauerbeck authored dwmw2 committed
    Apparently, the check for a 6-byte ID string introduced by commit
    426c457 ("mtd: nand: extend NAND flash
    detection to new MLC chips") is NOT sufficient to determine whether or
    not a Samsung chip uses their new MLC detection scheme or the old,
    standard scheme. This adds a condition to check cell type.
    
    Signed-off-by: Tilman Sauerbeck <tilman@code-monkey.de>
    Signed-off-by: Brian Norris <norris@broadcom.com>
    Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
    Cc: stable@kernel.org
  2. @torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    torvalds authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, apic: Fix apic=debug boot crash
      x86, hotplug: Serialize CPU hotplug to avoid bringup concurrency issues
      x86-32: Fix dummy trampoline-related inline stubs
      x86-32: Separate 1:1 pagetables from swapper_pg_dir
      x86, cpu: Fix regression in AMD errata checking code
  3. @torvalds

    Documentation: fix ozlabs.org mailing list address

    Stephen Rothwell authored torvalds committed
    This list moved to lists.ozlabs.org quite some time ago.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  4. @torvalds

    MAINTAINERS: Fix ozlabs.org mailing list addresses

    Stephen Rothwell authored torvalds committed
    All these lists moved to lists.ozlabs.org quite a while ago.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @torvalds

    Documentation: kernel-locking: mutex_trylock cannot be used in interr…

    Stefan Richter authored torvalds committed
    …upt context
    
    Chapter 6 is right about mutex_trylock, but chapter 10 wasn't.  This error
    was introduced during semaphore-to-mutex conversion of the Unreliable
    guide.  :-)
    
    If user context which performs mutex_lock() or mutex_trylock() is
    preempted by interrupt context which performs mutex_trylock() on the same
    mutex instance, a deadlock occurs.  This is because these functions do not
    disable local IRQs when they operate on mutex->wait_lock.
    
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Acked-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Matthew Wilcox <matthew@wil.cx>
    Cc: Randy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  6. @torvalds

    drivers/scsi/qla4xxx: fix build

    Andrew Morton authored torvalds committed
    gcc-4.0.2:
    
      drivers/scsi/qla4xxx/ql4_os.c: In function 'qla4_8xxx_error_recovery':
      drivers/scsi/qla4xxx/ql4_glbl.h:135: sorry, unimplemented: inlining failed in call to 'qla4_8xxx_set_drv_active': function body not available
      drivers/scsi/qla4xxx/ql4_os.c:2377: sorry, unimplemented: called from here
      drivers/scsi/qla4xxx/ql4_glbl.h:135: sorry, unimplemented: inlining failed in call to 'qla4_8xxx_set_drv_active': function body not available
      drivers/scsi/qla4xxx/ql4_os.c:2393: sorry, unimplemented: called from here
    
    Cc: Ravi Anand <ravi.anand@qlogic.com>
    Cc: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
    Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  7. @torvalds

    uml: fix compile error in dma_get_cache_alignment()

    Miklos Szeredi authored torvalds committed
    Fix uml compile error:
    
      include/linux/dma-mapping.h:145: error: redefinition of 'dma_get_cache_alignment'
      arch/um/include/asm/dma-mapping.h:99: note: previous definition of 'dma_get_cache_alignment' was here
    
    Introduced by commit 4565f01 ("dma-mapping: unify
    dma_get_cache_alignment implementations")
    
    Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
    Cc: Jeff Dike <jdike@addtoit.com>
    Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @kosaki @torvalds

    oom: __task_cred() need rcu_read_lock()

    kosaki authored torvalds committed
    dump_tasks() needs to hold the RCU read lock around its access of the
    target task's UID.  To this end it should use task_uid() as it only needs
    that one thing from the creds.
    
    The fact that dump_tasks() holds tasklist_lock is insufficient to prevent the
    target process replacing its credentials on another CPU.
    
    Then, this patch change to call rcu_read_lock() explicitly.
    
    	===================================================
    	[ INFO: suspicious rcu_dereference_check() usage. ]
    	---------------------------------------------------
    	mm/oom_kill.c:410 invoked rcu_dereference_check() without protection!
    
    	other info that might help us debug this:
    
    	rcu_scheduler_active = 1, debug_locks = 1
    	4 locks held by kworker/1:2/651:
    	 #0:  (events){+.+.+.}, at: [<ffffffff8106aae7>]
    	process_one_work+0x137/0x4a0
    	 #1:  (moom_work){+.+...}, at: [<ffffffff8106aae7>]
    	process_one_work+0x137/0x4a0
    	 #2:  (tasklist_lock){.+.+..}, at: [<ffffffff810fafd4>]
    	out_of_memory+0x164/0x3f0
    	 #3:  (&(&p->alloc_lock)->rlock){+.+...}, at: [<ffffffff810fa48e>]
    	find_lock_task_mm+0x2e/0x70
    
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Acked-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. @kosaki @torvalds

    oom: fix tasklist_lock leak

    kosaki authored torvalds committed
    Commit 0aad4b3 ("oom: fold __out_of_memory into out_of_memory")
    introduced a tasklist_lock leak.  Then it caused following obvious
    danger warnings and panic.
    
        ================================================
        [ BUG: lock held when returning to user space! ]
        ------------------------------------------------
        rsyslogd/1422 is leaving the kernel with locks still held!
        1 lock held by rsyslogd/1422:
         #0:  (tasklist_lock){.+.+.+}, at: [<ffffffff810faf64>] out_of_memory+0x164/0x3f0
        BUG: scheduling while atomic: rsyslogd/1422/0x00000002
        INFO: lockdep is turned off.
    
    This patch fixes it.
    
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
    Acked-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  10. @kosaki @torvalds

    oom: fix NULL pointer dereference

    kosaki authored torvalds committed
    Commit b940fd7 ("oom: remove unnecessary code and cleanup") added an
    unnecessary NULL pointer dereference.  remove it.
    
    Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
    Acked-by: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  11. @torvalds

    drivers/mmc/host/sdhci-s3c.c: use the correct mutex and card detect f…

    Kyungmin Park authored torvalds committed
    …unction
    
    There's some merge problem between sdhic core and sdhci-s3c host.  After
    mutex is changed to spinlock.  It needs to use use spin lock functions and
    use the correct card detection function.
    
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  12. @torvalds

    sdhci: add no hi-speed bit quirk support

    Kyungmin Park authored torvalds committed
    Some SDHCI controllers like s5pc110 don't have an HISPD bit in the HOSTCTL
    register.
    
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  13. @torvalds

    s5pc110: SDHCI-s3c support on s5pc110

    Kyungmin Park authored torvalds committed
    s5pc110 (aka s5pv210) uses the same SDHCI IP.
    
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  14. @torvalds

    s5pc110: SDHCI-s3c can override host capabilities

    Kyungmin Park authored torvalds committed
    Each board can override the default sdhci host capabilities.
    Some board has broken features by hardwares and support 8-bit bandwidth.
    
    Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
    Cc: <linux-mmc@vger.kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  15. @jankara @torvalds

    lib/radix-tree.c: fix overflow in radix_tree_range_tag_if_tagged()

    jankara authored torvalds committed
    When radix_tree_maxindex() is ~0UL, it can happen that scanning overflows
    index and tree traversal code goes astray reading memory until it hits
    unreadable memory.  Check for overflow and exit in that case.
    
    Signed-off-by: Jan Kara <jack@suse.cz>
    Cc: Christoph Hellwig <hch@lst.de>
    Cc: Nick Piggin <nickpiggin@yahoo.com.au>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  16. @torvalds

    revert "hwmon: f71882fg: add support for the Fintek F71808E"

    Andrew Morton authored torvalds committed
    Revert commit 7721fea ("hwmon:
    f71882fg: add support for the Fintek F71808E").
    
    Hans said:
    
    : A second review after I've received a data sheet for this device from
    : Fintek has turned up a few bugs.
    :
    : Unfortunately Giel (nor I) have time to fix this in time for the 2.6.36
    : cycle.  Therefor I would like to see this patch reverted as not having any
    : support for the hwmon function of this superio chip is better then having
    : unreliable support.
    
    Cc: Giel van Schijndel <me@mortis.eu>
    Cc: Jean Delvare <khali@linux-fr.org>
    Cc: Hans de Goede <hdegoede@redhat.com>
    Cc: Jonathan Cameron <jic23@cam.ac.uk>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Something went wrong with that request. Please try again.