Permalink
Commits on Feb 23, 2010
  1. Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…

    …linus
    
    * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
      MIPS: BCM47xx: Fix 128MB RAM support
      MIPS: Highmem: Fix build error
    torvalds committed Feb 23, 2010
  2. Merge branch 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux…

    …/kernel/git/frob/linux-2.6-roland
    
    * 'parisc/tracehook' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
      Revert "parisc: HAVE_ARCH_TRACEHOOK"
    torvalds committed Feb 23, 2010
  3. fs/exec.c: fix initial stack reservation

    803bf5e ("fs/exec.c: restrict initial
    stack space expansion to rlimit") attempts to limit the initial stack to
    20*PAGE_SIZE.  Unfortunately, in attempting ensure the stack is not
    reduced in size, we ended up not changing the stack at all.
    
    This size reduction check is not necessary as the expand_stack call does
    this already.
    
    This caused a regression in UML resulting in most guest processes being
    killed.
    
    Signed-off-by: Michael Neuling <mikey@neuling.org>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Acked-by: WANG Cong <xiyou.wangcong@gmail.com>
    Cc: Anton Blanchard <anton@samba.org>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: James Morris <jmorris@namei.org>
    Cc: Serge Hallyn <serue@us.ibm.com>
    Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
    Cc: Jouni Malinen <j@w1.fi>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    mikey committed with torvalds Feb 22, 2010
  4. efifb: fix framebuffer handoff

    Commit 4410f39 ("fbdev: add support for
    handoff from firmware to hw framebuffers") didn't add fb_destroy
    operation to efifb.  Fix it and change aperture_size to match size
    passed to request_mem_region.
    
    Addresses http://bugzilla.kernel.org/show_bug.cgi?id=15151
    
    Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
    Reported-by: Alex Zhavnerchik <alex.vizor@gmail.com>
    Tested-by: Alex Zhavnerchik <alex.vizor@gmail.com>
    Acked-by: Peter Jones <pjones@redhat.com>
    Cc: Huang Ying <ying.huang@intel.com>
    Cc: Dave Airlie <airlied@redhat.com>
    Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    mslusarz committed with torvalds Feb 22, 2010
  5. geode-mfgpt: restore previous behavior for selecting IRQ

    geode-mfgpt: restore previous behavior for selecting IRQ
    
    The MFGPT IRQ used to be, in order of decreasing priority,
     * IRQ supplied by the user as a boot-time parameter,
     * IRQ previously set by the BIOS or another driver,
     * default IRQ given at compile time.
    
    Return to this behavior, which got broken when splitting the
    MFGPT/clocksource driver for 2.6.33-rc1.
    
    Signed-off-by: Jens Rottmann <JRottmann@LiPPERTEmbedded.de>
    Acked-by: Andres Salomon <dilinger@collabora.co.uk>
    Cc: Jordan Crouse <jordan.crouse@amd.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: john stultz <johnstul@us.ibm.com>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Jens Rottmann committed with torvalds Feb 22, 2010
  6. idr: fix a critical misallocation bug, take#2

    This is retry of reverted 859ddf0
    ("idr: fix a critical misallocation bug") which contained two bugs.
    
    * pa[idp->layers] should be cleared even if it's not used by
      sub_alloc() because it's used by mark idr_mark_full().
    
    * The original condition check also assigned pa[l] to p which the new
      code didn't do thus leaving p pointing at the wrong layer.
    
    Both problems have been fixed and the idr code has received good amount
    testing using userland testing setup where simple bitmap allocator is
    run parallel to verify the result of idr allocation.
    
    The bug this patch fixes is caused by sub_alloc() optimization path
    bypassing out-of-room condition check and restarting allocation loop
    with starting value higher than maximum allowed value.  For detailed
    description, please read commit message of 859ddf0.
    
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Based-on-patch-from: Eric Paris <eparis@redhat.com>
    Reported-by: Eric Paris <eparis@redhat.com>
    Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de>
    Tested-by: Serge Hallyn <serue@us.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    htejun committed with torvalds Feb 22, 2010
  7. kernel/sys.c: fix missing rcu protection for sys_getpriority()

    find_task_by_vpid() is not safe without rcu_read_lock().  2.6.33-rc7 got
    RCU protection for sys_setpriority() but missed it for sys_getpriority().
    
    Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: "Paul E. McKenney" <paulmck@us.ibm.com>
    Acked-by: Serge Hallyn <serue@us.ibm.com>
    Acked-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Tetsuo Handa committed with torvalds Feb 22, 2010
  8. memcg: fix oom killing a child process in an other cgroup

    Presently the oom-killer is memcg aware and it finds the worst process
    from processes under memcg(s) in oom.  Then, it kills victim's child
    first.
    
    It may kill a child in another cgroup and may not be any help for
    recovery.  And it will break the assumption users have.
    
    This patch fixes it.
    
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
    Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
    Cc: Balbir Singh <balbir@linux.vnet.ibm.com>
    Reviewed-by: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>
    Acked-by: David Rientjes <rientjes@google.com>
    Cc: <stable@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    hkamezawa committed with torvalds Feb 22, 2010
Commits on Feb 22, 2010
  1. MIPS: BCM47xx: Fix 128MB RAM support

    Ignoring the last page when ddr size is 128M. Cached accesses to last page
    is causing the processor to prefetch using address above 128M stepping out
    of the DDR address space.
    
    Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
    Cc: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/981/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    hauke committed with ralfbaechle Feb 20, 2010
  2. MIPS: Highmem: Fix build error

    arch/mips/mm/highmem.c: In function 'kmap_init':
    arch/mips/mm/highmem.c:130: error: 'init_mm' undeclared (first use in this function)
    arch/mips/mm/highmem.c:130: error: (Each undeclared identifier is reported only once
    arch/mips/mm/highmem.c:130: error: for each function it appears in.)
    
    Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
    Cc: linux-mips <linux-mips@linux-mips.org>
    Patchwork: http://patchwork.linux-mips.org/patch/980/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    Yoichi Yuasa committed with ralfbaechle Feb 20, 2010
  3. Revert "parisc: HAVE_ARCH_TRACEHOOK"

    This reverts commit 81bf550.
    
    HAVE_ARCH_TRACEHOOK requires defining the user_regset interfaces,
    including task_user_regset_view().  parisc doesn't do that yet,
    so don't lie about it.
    
    Signed-off-by: Roland McGrath <roland@redhat.com>
    Roland McGrath committed Feb 22, 2010
  4. Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf probe: Init struct probe_point and set counter correctly
      hw-breakpoint: Keep track of dr7 local enable bits
      hw-breakpoints: Accept breakpoints on NULL address
      perf_events: Fix FORK events
    torvalds committed Feb 22, 2010
  5. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/dtor/input
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
      Input: usbtouchscreen - extend coordinate range for Generaltouch devices
      Input: polldev can cause crash in case when polling disabled
    torvalds committed Feb 22, 2010
  6. i915 / PM: Fix hibernate regression caused by suspend/resume splitting

    Commit 84b79f8 (drm/i915: Fix crash
    while aborting hibernation) attempted to fix a regression introduced
    by commit cbda12d (drm/i915:
    implement new pm ops for i915), but it went too far trying to split
    the freeze/suspend and resume/thaw parts of the code.  As a result,
    it introduced another regression, which only is visible on some systems.
    
    Fix the problem by merging i915_drm_suspend() with
    i915_drm_freeze() and moving some code from i915_resume()
    into i915_drm_thaw(), so that intel_opregion_free() and
    intel_opregion_init() are also executed in the freeze and thaw code
    paths, respectively.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Reported-and-tested-by: Pedro Ribeiro <pedrib@gmail.com>
    Tested-by: Tino Keitel <tino.keitel@tikei.de>
    Acked-by: Eric Anholt <eric@anholt.net>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    rjwysocki committed with torvalds Feb 18, 2010
  7. perf probe: Init struct probe_point and set counter correctly

    Clear struct probe_point before using it in
    show_perf_probe_events(), and set pp->found counter correctly in
    synthesize_perf_probe_point(). Without this initialization,
    clear_probe_point() will free random addresses.
    
    Signed-off-by: Masami Hiramatsu <mhiramat@redhat.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Mike Galbraith <efault@gmx.de>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: systemtap <systemtap@sources.redhat.com>
    Cc: DLE <dle-develop@lists.sourceforge.net>
    LKML-Reference: <20100218181652.26547.57790.stgit@dhcp-100-2-132.bos.redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Masami Hiramatsu committed with Ingo Molnar Feb 18, 2010
  8. Input: usbtouchscreen - extend coordinate range for Generaltouch devices

    Generaltouch protocol allows for coordinates in [0, 0xffff] range and
    there are devices reporting coordinates as high as 0x7fff so let's update
    the driver to reflect that.
    
    Signed-off-by: Roy Yin <yhch@generaltouch.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    Roy Yin committed with dtor Feb 22, 2010
  9. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc32: Fix struct stat uid/gid types.
    torvalds committed Feb 22, 2010
  10. sparc32: Fix struct stat uid/gid types.

    Commit 085219f
    ("sparc32: use proper types in struct stat")
    
    Accidently changed the struct stat uid/gid members
    to uid_t and gid_t, but those get set to
    __kernel_uid32_t and __kernel_gid32_t respectively.
    Those are of type 'int' but the structure is meant
    to have 'short'.  So use uid16_t and gid16_t to
    correct this.
    
    Reported-by: Rob Landley <rob@landley.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Feb 22, 2010
Commits on Feb 21, 2010
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] bfin: fix max timeout calculation
    torvalds committed Feb 21, 2010
  2. [WATCHDOG] bfin: fix max timeout calculation

    Relying on overflow/wrap around isn't exact because if you wrap far
    enough, you get back to "valid" values.
    
    Reported-by: Thorsten Pohlmann <pohlmann@tetronik.com>
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
    Cc: stable <stable@kernel.org>
    vapier committed with Wim Van Sebroeck Feb 16, 2010
  3. mm: Make copy_from_user() in migrate.c statically predictable

    x86-32 has had a static test for copy_on_user() overflow for a while.
    This test currently fails in mm/migrate.c resulting in an
    allyesconfig/allmodconfig build failure on x86-32:
    
    In function ‘copy_from_user’,
        inlined from ‘do_pages_stat’ at
        /home/hpa/kernel/git/mm/migrate.c:1012:
    /home/hpa/kernel/git/arch/x86/include/asm/uaccess_32.h:212: error:
        call to ‘copy_from_user_overflow’ declared
    
    Make the logic more explicit and therefore easier for gcc to
    understand.
    
    v2: rewrite the loop entirely using a more normal structure for a
        chunked-data loop (Linus Torvalds)
    
    Reported-by: Len Brown <lenb@kernel.org>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Reviewed-and-Tested-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: Arjan van de Ven <arjan@linux.kernel.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Cc: Christoph Lameter <cl@linux-foundation.org>
    Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Cc: Rik van Riel <riel@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    H. Peter Anvin committed with torvalds Feb 19, 2010
  4. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      CacheFiles: Fix a race in cachefiles_delete_object() vs rename
      vfs: don't call ima_file_check() unconditionally in nfsd_open()
      fs: inode - remove 8 bytes of padding on 64bits allowing 1 more objects/slab under slub
      Switch proc/self to nd_set_link()
      fix LOOKUP_FOLLOW on automount "symlinks"
    torvalds committed Feb 21, 2010
  5. Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/ke…

    …rnel/git/mchehab/linux-2.6
    
    * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
      V4L/DVB: bttv: Move I2C IR initialization
      V4L/DVB: Video : pwc : Fix regression in pwc_set_shutter_speed caused by bad 	constant => sizeof conversion.
      soc-camera: mt9t112: modify exiting conditions from standby mode
      V4L/DVB: cxusb: Select all required frontend and tuner modules
      V4L/DVB: dvb: l64781.ko broken with gcc 4.5
    torvalds committed Feb 21, 2010
  6. Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tmlind/linux-omap-2.6
    
    * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
      omap: Remove DEBUG_FS dependency for mux name checking
    torvalds committed Feb 21, 2010
  7. Merge master.kernel.org:/home/rmk/linux-2.6-arm

    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: allow alignment fault mode to be configured at kernel boot
      ARM: Update mach-types
      ARM: 5951/1: ARM: fix documentation of the PrimeCell bus
      ARM: 5950/1: ARM: Fix build error for arm1026ej-s processor
      MAINTAINERS: fix my e-mail and status for Gemini and FA526
      Gemini: wrong registers used to set reg_level in gpio_set_irq_type()
      ARM: 5944/1: scsi: fix timer setup in fas216.c
      ARM: 5938/1: ARM: L2: export outer_cache_fns
    torvalds committed Feb 21, 2010
Commits on Feb 20, 2010
  1. ARM: allow alignment fault mode to be configured at kernel boot

    Some glibc versions intentionally create lots of alignment faults in
    their gconv code, which if not fixed up, results in segfaults during
    boot.  This can prevent systems booting properly.
    
    There is no clear hard-configurable default for this; the desired
    default depends on the nature of the userspace which is going to be
    booted.
    
    So, provide a way for the alignment fault handler to be configured via
    the kernel command line.
    
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King committed Feb 20, 2010
  2. CacheFiles: Fix a race in cachefiles_delete_object() vs rename

    cachefiles_delete_object() can race with rename.  It gets the parent directory
    of the object it's asked to delete, then locks it - but rename may have changed
    the object's parent between the get and the completion of the lock.
    
    However, if such a circumstance is detected, we abandon our attempt to delete
    the object - since it's no longer in the index key path, it won't be seen
    again by lookups of that key.  The assumption is that cachefilesd may have
    culled it by renaming it to the graveyard for later destruction.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    dhowells committed with Al Viro Feb 19, 2010
  3. ARM: Update mach-types

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Russell King committed Feb 20, 2010
  4. ARM: 5951/1: ARM: fix documentation of the PrimeCell bus

    This fixes the filepath encoded in <linux/amba/bus.h> and adds
    some documentation as to what this bus really means.
    
    Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Linus Walleij committed with Russell King Feb 20, 2010
  5. ARM: 5950/1: ARM: Fix build error for arm1026ej-s processor

    This patch fix the below build error for arm1026ej-s processor (IntegratorCP/arm1026ej-s board).
      CC      init/main.o
    In file included from include/linux/highmem.h:8,
                     from include/linux/pagemap.h:10,
                     from include/linux/mempolicy.h:62,
                     from init/main.c:52:
    arch/arm/include/asm/cacheflush.h:134:2: error: #error Unknown cache maintainence model
    make[1]: *** [init/main.o] Erreur 1
    make: *** [init] Erreur 2
    
    Signed-off-by: Abdoulaye Walsimou Gaye <walsimou@walsimou.com>
    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    Abdoulaye Walsimou Gaye committed with Russell King Feb 19, 2010
  6. Input: polldev can cause crash in case when polling disabled

    When polled input device is opened and closed and there are no other
    users of polled device, the workqueue is created and destroyed in
    every open / close operation. It is probable that at some point
    dynamic allocation of internal parts of the workqueue cause changes to the
    workqueue.
    
    When a work is queued to the workqueue the work struct contains pointers
    to the workqueue data. If the workqueue has been changed and the work
    has never been queued to the new workqueue, work-struct contains pointers
    to the non-existing workqueue. This will cause crash at the work
    cancellation during device close since cancellation of a work assumes
    that the workqueue exists.
    
    To prevent that, work struct is cleaned up at device close. This keeps
    work struct clean for the next use.
    
    Signed-off-by: Samu Onkalo <samu.p.onkalo@nokia.com>
    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    Samu Onkalo committed with dtor Feb 20, 2010
  7. vfs: don't call ima_file_check() unconditionally in nfsd_open()

    commit 1e41568 ("Take ima_path_check()
    in nfsd past dentry_open() in nfsd_open()") moved this code back to its
    original location but missed the "else".
    
    Signed-off-by: Chuck Ebbert <cebbert@redhat.com>
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Chuck Ebbert committed with Al Viro Feb 15, 2010
  8. Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] megaraid_sas: fix for 32bit apps
      [SCSI] fcoe: Only rmmod fcoe.ko if there are no active connections
      [SCSI] libfcoe: Send port LKA every FIP_VN_KA_PERIOD secs.
      [SCSI] libfc: Don't assume response request present.
      [SCSI] libfc: Fix e_d_tov ns -> ms scaling factor in PLOGI response.
      [SCSI] libfc: call ddp setup for only FCP reads to avoid accessing junk fsp pointer
      [SCSI] iscsi_tcp regression: remove bogus warn on in write path
    torvalds committed Feb 20, 2010
  9. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      sfc: SFE4002/SFN4112F: Widen temperature and voltage tolerances
      sfc: Fix sign of efx_mcdi_poll_reboot() error in efx_mcdi_poll()
      net-sysfs: Use rtnl_trylock in wireless sysfs methods.
      net: Fix sysctl restarts...
    torvalds committed Feb 20, 2010
  10. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix sun4u execute bit check in TSB I-TLB load.
      sparc: Fix incorrect comparison in of_bus_ambapp_match()
      sparc64: Sync of_create_pci_dev() with drivers/pci/probe.c changes.
      sparc64: Tighten checks in kstack_valid().
    torvalds committed Feb 20, 2010