Permalink
Commits on Oct 4, 2010
  1. Merge branch 'configs-2.6.35'

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 4, 2010
  2. configs-2.6.35: trivial config update

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 4, 2010
    BFSv357 still causes RCU stalls under heavy load, but behaves itself
    much more smoothly.
  3. Merge branch 'version-2.6.35'

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 4, 2010
  4. version-2.6.35: bump version to 2.6.35-pf11

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 4, 2010
  5. Merge remote branch 'tuxonice-2.6.35/combined'

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 4, 2010
  6. Merge branch 'ck-2.6.35'

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 4, 2010
  7. ck-2.6.35: update BFS to v357

    Oleksandr Natalenko
    Oleksandr Natalenko committed Oct 4, 2010
Commits on Sep 29, 2010
  1. fix merge conflict

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 29, 2010
  2. Merge branch 'stable' into combined

    Nigel Cunningham
    Nigel Cunningham committed Sep 29, 2010
  3. Linux 2.6.35.7

    gregkh committed Sep 29, 2010
    Done at LinuxCon Tokyo 2010
  4. Xen: fix typo in previous patch

    James Dingwall authored and gregkh committed Sep 27, 2010
    Correctly name the irq_chip structure to fix an immediate failure when booting
    as a xen pv_ops guest with a NULL pointer exception. The missing 'x' was
    introduced in commit [fb412a1] applied to
    2.6.3[25]-stable trees.  The commit to mainline was
    [aaca496] which did not have the problem.
    
    Signed-off-by: James Dingwall <james@dingwall.me.uk>
    Reported-by: Pawel Zuzelski <pawelz@pld-linux.org>
    Tested-by: Pawel Zuzelski <pawelz@pld-linux.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Commits on Sep 27, 2010
  1. Merge branch 'configs-2.6.35'

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
  2. configs-2.6.35: disable NTFS support for Dell Inspiron 1525 laptop

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
    This commit disables NTFS support due to ntfs-3g via FUSE working.
  3. Merge branch 'configs-2.6.35'

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
  4. configs-2.6.35: enable more CFS features for Dell Inspiron 1525

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
  5. Merge branch 'configs-2.6.35'

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
  6. configs-2.6.35: update config for Dell Inspiron 1525 laptop

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
    This commit disables:
    -BFS due to soft lock-up bug in v350;
    -BFQ due to noop+NCQ working;
    -LinuxIMQ due to useless;
    -MTD due to useless.
    
    Nevertheless, these features are still available and may be enabled at
    any time.
  7. Merge branch 'configs-2.6.35'

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
  8. configs-2.6.35: update comments to match current version

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
  9. Merge branch 'version-2.6.35'

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
  10. version-2.6.35: bump version to v2.6.35-pf10

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
  11. Merge remote branch 'tuxonice-2.6.35/combined'

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
  12. fix merge conflict

    Oleksandr Natalenko
    Oleksandr Natalenko committed Sep 27, 2010
  13. Merge branch 'stable' into combined

    Nigel Cunningham
    Nigel Cunningham committed Sep 27, 2010
  14. Linux 2.6.35.6

    gregkh committed Sep 27, 2010
  15. alpha: Fix printk format errors

    Michael Cree authored and gregkh committed Sep 1, 2010
    commit 3e07336 upstream.
    
    When compiling alpha generic build get errors such as:
    arch/alpha/kernel/err_marvel.c: In function ‘marvel_print_err_cyc’:
    arch/alpha/kernel/err_marvel.c:119: error: format ‘%ld’ expects type ‘long int’, but argument 6 has type ‘u64’
    
    Replaced a number of %ld format specifiers with %lld since u64
    is unsigned long long.
    
    Signed-off-by: Michael Cree <mcree@orcon.net.nz>
    Signed-off-by: Matt Turner <mattst88@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  16. drm/i915: Ensure that the crtcinfo is populated during mode_fixup()

    ickle authored and gregkh committed Sep 12, 2010
    commit 8974935 upstream.
    
    This should fix the mysterious mode setting failures reported during
    boot up and after resume, generally for i8xx class machines.
    
    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=16478
    Reported-and-tested-by: Xavier Chantry <chantry.xavier@gmail.com>
    Buzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29413
    Tested-by: Daniel Vetter <daniel@ffwll.ch>
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  17. sctp: Do not reset the packet during sctp_packet_config().

    Vlad Yasevich authored and gregkh committed Sep 15, 2010
    commit 4bdab43 upstream.
    
    sctp_packet_config() is called when getting the packet ready
    for appending of chunks.  The function should not touch the
    current state, since it's possible to ping-pong between two
    transports when sending, and that can result packet corruption
    followed by skb overlfow crash.
    
    Reported-by: Thomas Dreibholz <dreibh@iem.uni-due.de>
    Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  18. Fix unprotected access to task credentials in waitid()

    Daniel J Blueman authored and gregkh committed Aug 17, 2010
    commit f362b73 upstream.
    
    Using a program like the following:
    
    	#include <stdlib.h>
    	#include <unistd.h>
    	#include <sys/types.h>
    	#include <sys/wait.h>
    
    	int main() {
    		id_t id;
    		siginfo_t infop;
    		pid_t res;
    
    		id = fork();
    		if (id == 0) { sleep(1); exit(0); }
    		kill(id, SIGSTOP);
    		alarm(1);
    		waitid(P_PID, id, &infop, WCONTINUED);
    		return 0;
    	}
    
    to call waitid() on a stopped process results in access to the child task's
    credentials without the RCU read lock being held - which may be replaced in the
    meantime - eliciting the following warning:
    
    	===================================================
    	[ INFO: suspicious rcu_dereference_check() usage. ]
    	---------------------------------------------------
    	kernel/exit.c:1460 invoked rcu_dereference_check() without protection!
    
    	other info that might help us debug this:
    
    	rcu_scheduler_active = 1, debug_locks = 1
    	2 locks held by waitid02/22252:
    	 #0:  (tasklist_lock){.?.?..}, at: [<ffffffff81061ce5>] do_wait+0xc5/0x310
    	 #1:  (&(&sighand->siglock)->rlock){-.-...}, at: [<ffffffff810611da>]
    	wait_consider_task+0x19a/0xbe0
    
    	stack backtrace:
    	Pid: 22252, comm: waitid02 Not tainted 2.6.35-323cd+ #3
    	Call Trace:
    	 [<ffffffff81095da4>] lockdep_rcu_dereference+0xa4/0xc0
    	 [<ffffffff81061b31>] wait_consider_task+0xaf1/0xbe0
    	 [<ffffffff81061d15>] do_wait+0xf5/0x310
    	 [<ffffffff810620b6>] sys_waitid+0x86/0x1f0
    	 [<ffffffff8105fce0>] ? child_wait_callback+0x0/0x70
    	 [<ffffffff81003282>] system_call_fastpath+0x16/0x1b
    
    This is fixed by holding the RCU read lock in wait_task_continued() to ensure
    that the task's current credentials aren't destroyed between us reading the
    cred pointer and us reading the UID from those credentials.
    
    Furthermore, protect wait_task_stopped() in the same way.
    
    We don't need to keep holding the RCU read lock once we've read the UID from
    the credentials as holding the RCU read lock doesn't stop the target task from
    changing its creds under us - so the credentials may be outdated immediately
    after we've read the pointer, lock or no lock.
    
    Signed-off-by: Daniel J Blueman <daniel.blueman@gmail.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Acked-by: Oleg Nesterov <oleg@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19. guard page for stacks that grow upwards

    Luck, Tony authored and gregkh committed Aug 24, 2010
    commit 8ca3eb0 upstream.
    
    pa-risc and ia64 have stacks that grow upwards. Check that
    they do not run into other mappings. By making VM_GROWSUP
    0x0 on architectures that do not ever use it, we can avoid
    some unpleasant #ifdefs in check_stack_guard_page().
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: dann frazier <dannf@debian.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  20. mm: page allocator: update free page counters after pages are placed …

    gormanm authored and gregkh committed Sep 9, 2010
    …on the free list
    
    commit 72853e2 upstream.
    
    When allocating a page, the system uses NR_FREE_PAGES counters to
    determine if watermarks would remain intact after the allocation was made.
    This check is made without interrupts disabled or the zone lock held and
    so is race-prone by nature.  Unfortunately, when pages are being freed in
    batch, the counters are updated before the pages are added on the list.
    During this window, the counters are misleading as the pages do not exist
    yet.  When under significant pressure on systems with large numbers of
    CPUs, it's possible for processes to make progress even though they should
    have been stalled.  This is particularly problematic if a number of the
    processes are using GFP_ATOMIC as the min watermark can be accidentally
    breached and in extreme cases, the system can livelock.
    
    This patch updates the counters after the pages have been added to the
    list.  This makes the allocator more cautious with respect to preserving
    the watermarks and mitigates livelock possibilities.
    
    [akpm@linux-foundation.org: avoid modifying incoming args]
    Signed-off-by: Mel Gorman <mel@csn.ul.ie>
    Reviewed-by: Rik van Riel <riel@redhat.com>
    Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
    Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Reviewed-by: Christoph Lameter <cl@linux.com>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Acked-by: Johannes Weiner <hannes@cmpxchg.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  21. mm: page allocator: calculate a better estimate of NR_FREE_PAGES when…

    Christoph Lameter authored and gregkh committed Sep 9, 2010
    … memory is low and kswapd is awake
    
    commit aa45484 upstream.
    
    Ordinarily watermark checks are based on the vmstat NR_FREE_PAGES as it is
    cheaper than scanning a number of lists.  To avoid synchronization
    overhead, counter deltas are maintained on a per-cpu basis and drained
    both periodically and when the delta is above a threshold.  On large CPU
    systems, the difference between the estimated and real value of
    NR_FREE_PAGES can be very high.  If NR_FREE_PAGES is much higher than
    number of real free page in buddy, the VM can allocate pages below min
    watermark, at worst reducing the real number of pages to zero.  Even if
    the OOM killer kills some victim for freeing memory, it may not free
    memory if the exit path requires a new page resulting in livelock.
    
    This patch introduces a zone_page_state_snapshot() function (courtesy of
    Christoph) that takes a slightly more accurate view of an arbitrary vmstat
    counter.  It is used to read NR_FREE_PAGES while kswapd is awake to avoid
    the watermark being accidentally broken.  The estimate is not perfect and
    may result in cache line bounces but is expected to be lighter than the
    IPI calls necessary to continually drain the per-cpu counters while kswapd
    is awake.
    
    Signed-off-by: Christoph Lameter <cl@linux.com>
    Signed-off-by: Mel Gorman <mel@csn.ul.ie>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  22. mm: page allocator: drain per-cpu lists after direct reclaim allocati…

    gormanm authored and gregkh committed Sep 9, 2010
    …on fails
    
    commit 9ee493c upstream.
    
    When under significant memory pressure, a process enters direct reclaim
    and immediately afterwards tries to allocate a page.  If it fails and no
    further progress is made, it's possible the system will go OOM.  However,
    on systems with large amounts of memory, it's possible that a significant
    number of pages are on per-cpu lists and inaccessible to the calling
    process.  This leads to a process entering direct reclaim more often than
    it should increasing the pressure on the system and compounding the
    problem.
    
    This patch notes that if direct reclaim is making progress but allocations
    are still failing that the system is already under heavy pressure.  In
    this case, it drains the per-cpu lists and tries the allocation a second
    time before continuing.
    
    Signed-off-by: Mel Gorman <mel@csn.ul.ie>
    Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
    Reviewed-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Reviewed-by: Christoph Lameter <cl@linux.com>
    Cc: Dave Chinner <david@fromorbit.com>
    Cc: Wu Fengguang <fengguang.wu@intel.com>
    Cc: David Rientjes <rientjes@google.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  23. dell-wmi: Add support for eject key on Dell Studio 1555

    iamer authored and gregkh committed Jun 24, 2010
    commit d5164db upstream.
    
    Fixes pressing the eject key on Dell Studio 1555 does not work and produces
    message :
    
    dell-wmi: Unknown key 0 pressed
    
    Signed-off-by: Islam Amer <pharon@gmail.com>
    Cc: Kyle McMartin <kyle@mcmartin.ca>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  24. Fix call to replaced SuperIO functions

    Morten H. Larsen authored and gregkh committed Sep 1, 2010
    commit 59b25ed upstream.
    
    This patch fixes the failure to compile Alpha Generic because of
    previously overlooked calls to ns87312_enable_ide(). The function has
    been replaced by newer SuperIO code.
    
    Tested-by: Michael Cree <mcree@orcon.net.nz>
    Signed-off-by: Morten H. Larsen <m-larsen@post6.tele.dk>
    Signed-off-by: Matt Turner <mattst88@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>