Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.33-rc8-gi…
Commits on Feb 22, 2010
  1. @torvalds

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

    torvalds authored
    …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
  2. @torvalds

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

    torvalds authored
    …/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
  3. @rjwysocki @torvalds

    i915 / PM: Fix hibernate regression caused by suspend/resume splitting

    rjwysocki authored torvalds committed
    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>
  4. perf probe: Init struct probe_point and set counter correctly

    Masami Hiramatsu authored Ingo Molnar committed
    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>
  5. @dtor

    Input: usbtouchscreen - extend coordinate range for Generaltouch devices

    Roy Yin authored dtor committed
    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>
  6. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc32: Fix struct stat uid/gid types.
  7. @davem330

    sparc32: Fix struct stat uid/gid types.

    davem330 authored
    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>
Commits on Feb 21, 2010
  1. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

    torvalds authored
    …chdog
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
      [WATCHDOG] bfin: fix max timeout calculation
  2. @vapier

    [WATCHDOG] bfin: fix max timeout calculation

    vapier authored Wim Van Sebroeck committed
    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>
  3. @torvalds

    mm: Make copy_from_user() in migrate.c statically predictable

    H. Peter Anvin authored torvalds committed
    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>
  4. @torvalds

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

    torvalds authored
    …/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"
  5. @torvalds

    Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds authored
    …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
  6. @torvalds

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

    torvalds authored
    …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
  7. @torvalds

    Merge master.kernel.org:/home/rmk/linux-2.6-arm

    torvalds authored
    * 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
Commits on Feb 20, 2010
  1. ARM: allow alignment fault mode to be configured at kernel boot

    Russell King authored
    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>
  2. CacheFiles: Fix a race in cachefiles_delete_object() vs rename

    David Howells authored Al Viro committed
    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>
  3. ARM: Update mach-types

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

    Linus Walleij authored Russell King committed
    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>
  5. ARM: 5950/1: ARM: Fix build error for arm1026ej-s processor

    Abdoulaye Walsimou Gaye authored Russell King committed
    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>
  6. @dtor

    Input: polldev can cause crash in case when polling disabled

    Samu Onkalo authored dtor committed
    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>
  7. vfs: don't call ima_file_check() unconditionally in nfsd_open()

    Chuck Ebbert authored Al Viro committed
    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>
  8. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    torvalds authored
    …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
  9. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    torvalds authored
    * 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...
  10. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    torvalds authored
    * 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().
  11. @torvalds

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

    torvalds authored
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon: bump the UMS driver version number to indicate rv740 fix
      drm/radeon/kms: free fence IB if it wasn't emited at IB free time
      drm/ttm: fix caching problem on non-PAT systems.
      drm/radeon/rv740: fix backend setup
      drm/radeon/kms: fix shared ddc detection
      drm/radeon/kms/rs600: add connector quirk
      vgaarb: fix "target=default" passing
Commits on Feb 19, 2010
  1. @davem330

    sfc: SFE4002/SFN4112F: Widen temperature and voltage tolerances

    Ben Hutchings authored davem330 committed
    The temperature and voltage limits currently set on these boards are
    too conservative and will cause the driver to stop the net device
    erroneously in some systems.
    
    Based on a review of the chip datasheets and advice from the designer
    of these boards:
    
    - Raise the maximum board temperatures to the specified maximum ambient
      temperatures for their PHYs plus the expected temperature bias of the
      board
    - Raise the maximum controller temperature to 90 degrees
    - Lower the minimum temperatures to 0 degrees
    - Widen the voltage tolerances to at least +/- 10%
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  2. @davem330

    sfc: Fix sign of efx_mcdi_poll_reboot() error in efx_mcdi_poll()

    Ben Hutchings authored davem330 committed
    efx_mcdi_poll() uses positive error numbers, matching the MCDI
    protocol.  It must negate the result of efx_mcdi_poll_reboot() which
    returns the usual negative error numbers.
    
    Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  3. @ebiederm @davem330

    net-sysfs: Use rtnl_trylock in wireless sysfs methods.

    ebiederm authored davem330 committed
    The wireless sysfs methods like the rest of the networking sysfs
    methods are removed with the rtnl_lock held and block until
    the existing methods stop executing.  So use rtnl_trylock
    and restart_syscall so that the code continues to work.
    
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  4. @ebiederm @davem330

    net: Fix sysctl restarts...

    ebiederm authored davem330 committed
    Yuck.  It turns out that when we restart sysctls we were restarting
    with the values already changed.  Which unfortunately meant that
    the second time through we thought there was no change and skipped
    all kinds of work, despite the fact that there was indeed a change.
    
    I have fixed this the simplest way possible by restoring the changed
    values when we restart the sysctl write.
    
    One of my coworkers spotted this bug when after disabling forwarding
    on an interface pings were still forwarded.
    
    Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
  5. @davem330

    sparc64: Fix sun4u execute bit check in TSB I-TLB load.

    davem330 authored
    Thanks to testcase and report from Brad Spengler:
    
    --------------------
    #include <stdio.h>
    
    typedef int (* _wee)(void);
    
    int main(void)
    {
            char buf[8] = { '\x81', '\xc7', '\xe0', '\x08', '\x81', '\xe8',
                            '\x00', '\x00' };
            _wee wee;
            printf("%p\n", &buf);
            wee = (_wee)&buf;
            wee();
    
            return 0;
    }
    --------------------
    
    TSB I-tlb load code tries to use andcc to check the _PAGE_EXEC_4U bit,
    but that's bit 12 so it gets sign extended all the way up to bit 63
    and the test nearly always passes as a result.
    
    Use sethi to fix the bug.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  6. drm/radeon: bump the UMS driver version number to indicate rv740 fix

    Dave Airlie authored
    This lets UMS userspace know the rv740 fix is in. For KMS we can
    consider the kernel release to be the v2.0.0 release so we don't need the
    bump there.
    
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  7. drm/radeon/kms: free fence IB if it wasn't emited at IB free time

    Jerome Glisse authored Dave Airlie committed
    If at IB free time fence wasn't emited that means the IB wasn't
    scheduled because an error occured somewhere, thus we can free
    then fence and mark the IB as free.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  8. @curro

    drm/ttm: fix caching problem on non-PAT systems.

    curro authored Dave Airlie committed
    http://bugzilla.kernel.org/show_bug.cgi?id=15328
    
    This fixes a serious regression on AGP/non-PAT systems, where
    pages were ending up in the wrong state and slowing down the
    whole system.
    
    [airlied: taken this from the bug as the other option is to revert
    the change which caused it].
    
    Tested-by: John W. Linville (in bug).
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  9. drm/radeon/rv740: fix backend setup

    Alex Deucher authored Dave Airlie committed
    This patch fixes occlusion queries and rendering errors
    on rv740 boards. Hardcoding the backend map is not an optimal
    solution, but a better fix is being worked on.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  10. drm/radeon/kms: fix shared ddc detection

    Alex Deucher authored Dave Airlie committed
    Just compare the i2c id since the i2c structs
    may be slighly different.
    
    Fixes fdo bug 26616.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
Something went wrong with that request. Please try again.