Permalink
Commits on Sep 12, 2010
  1. Linux 2.6.36-rc4

    torvalds committed Sep 12, 2010
Commits on Sep 11, 2010
  1. docbook: skip files with no docs since they generate scary warnings

    Fix docbook templates that reference files that do not contain the
    expected kernel-doc notation.
    
    Fixes these warnings:
    
      Warning(arch/x86/include/asm/unaligned.h): no structured comments found
      Warning(lib/vsprintf.c): no structured comments found
    
    These cause errors in the generated html output, like below, so drop
    these lines.
    
      Name
      arch/x86/include/asm/unaligned.h - Document generation inconsistency
      Oops
      Warning
      The template for this document tried to insert the structured comment from the file arch/x86/include/asm/unaligned.h at this point, but none was found. This dummy section is inserted to allow generation to continue.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Randy Dunlap committed with torvalds Sep 11, 2010
  2. docbook: warn on unused doc entries

    When you don't use !E or !I but only !F, then it's very easy to miss
    including some functions, structs etc.  in documentation.  To help
    finding which ones were missed, allow printing out the unused ones as
    warnings.
    
    For example, using this on mac80211 yields a lot of warnings like this:
    
      Warning: didn't use docs for DOC: mac80211 workqueue
      Warning: didn't use docs for ieee80211_max_queues
      Warning: didn't use docs for ieee80211_bss_change
      Warning: didn't use docs for ieee80211_bss_conf
    
    when generating the documentation for it.
    
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    jmberg committed with torvalds Sep 11, 2010
  3. kernel-doc: ignore case when stripping attributes

    There are valid attributes that could have upper case letters, but we
    still want to remove, like for example
    	__attribute__((aligned(NETDEV_ALIGN)))
    as encountered in the wireless code.
    
    Signed-off-by: Johannes Berg <johannes.berg@intel.com>
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    jmberg committed with torvalds Sep 11, 2010
  4. Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…

    …git/rafael/suspend-2.6
    
    * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
      PM / Hibernate: Avoid hitting OOM during preallocation of memory
      PM QoS: Correct pr_debug() misuse and improve parameter checks
      PM: Prevent waiting forever on asynchronous resume after failing suspend
    torvalds committed Sep 11, 2010
  5. 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] fix use-after-free in scsi_init_io()
      [SCSI] sd: fix medium-removal bug
      [SCSI] qla2xxx: Update version number to 8.03.04-k0.
      [SCSI] qla2xxx: Check for empty slot in request queue before posting Command type 6 request.
      [SCSI] qla2xxx: Cover UNDERRUN case where SCSI status is set.
      [SCSI] qla2xxx: Correctly set fw hung and complete only waiting mbx.
      [SCSI] qla2xxx: Reset seconds_since_last_heartbeat correctly.
      [SCSI] qla2xxx: make rport deletions explicit during vport removal
      [SCSI] qla2xxx: Fix vport delete issues
      [SCSI] sd, sym53c8xx: Remove warnings after vsprintf %pV introducation.
      [SCSI] Fix warning: zero-length gnu_printf format string
      [SCSI] hpsa: disable doorbell reset on reset_devices
      [SCSI] be2iscsi: Fix for Login failure
      [SCSI] fix bio.bi_rw handling
    torvalds committed Sep 11, 2010
  6. PM / Hibernate: Avoid hitting OOM during preallocation of memory

    There is a problem in hibernate_preallocate_memory() that it calls
    preallocate_image_memory() with an argument that may be greater than
    the total number of available non-highmem memory pages.  If that's
    the case, the OOM condition is guaranteed to trigger, which in turn
    can cause significant slowdown to occur during hibernation.
    
    To avoid that, make preallocate_image_memory() adjust its argument
    before calling preallocate_image_pages(), so that the total number of
    saveable non-highem pages left is not less than the minimum size of
    a hibernation image.  Change hibernate_preallocate_memory() to try to
    allocate from highmem if the number of pages allocated by
    preallocate_image_memory() is too low.
    
    Modify free_unnecessary_pages() to take all possible memory
    allocation patterns into account.
    
    Reported-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Tested-by: M. Vefa Bicakci <bicave@superonline.com>
    rjwysocki committed Sep 11, 2010
  7. 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: (28 commits)
      ipheth: remove incorrect devtype to WWAN
      MAINTAINERS: Add CAIF
      sctp: fix test for end of loop
      KS8851: Correct RX packet allocation
      udp: add rehash on connect()
      net: blackhole route should always be recalculated
      ipv4: Suppress lockdep-RCU false positive in FIB trie (3)
      niu: Fix kernel buffer overflow for ETHTOOL_GRXCLSRLALL
      ipvs: fix active FTP
      gro: Re-fix different skb headrooms
      via-velocity: Turn scatter-gather support back off.
      ipv4: Fix reverse path filtering with multipath routing.
      UNIX: Do not loop forever at unix_autobind().
      PATCH: b44 Handle RX FIFO overflow better (simplified)
      irda: off by one
      3c59x: Fix deadlock in vortex_error()
      netfilter: discard overlapping IPv6 fragment
      ipv6: discard overlapping fragment
      net: fix tx queue selection for bridged devices implementing select_queue
      bonding: Fix jiffies overflow problems (again)
      ...
    
    Fix up trivial conflicts due to the same cgroup API thinko fix going
    through both Andrew and the networking tree.  However, there were small
    differences between the two, with Andrew's version generally being the
    nicer one, and the one I merged first. So pick that one.
    
    Conflicts in: include/linux/cgroup.h and kernel/cgroup.c
    torvalds committed Sep 11, 2010
  8. 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:
      sparc: Kill all BKL usage.
    torvalds committed Sep 11, 2010
  9. Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/…

    …linux/kernel/git/tip/linux-2.6-tip
    
    * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, tsc: Fix a preemption leak in restore_sched_clock_state()
      sched: Move sched_avg_update() to update_cpu_load()
    torvalds committed Sep 11, 2010
  10. x86, tsc: Fix a preemption leak in restore_sched_clock_state()

    Doh, a real life genuine preemption leak..
    
    This caused a suspend failure.
    
    Reported-bisected-and-tested-by-the-invaluable: Jeff Chua <jeff.chua.linux@gmail.com>
    Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Nico Schottelius <nico-linux-20100709@schottelius.org>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Florian Pritz <flo@xssn.at>
    Cc: Suresh Siddha <suresh.b.siddha@intel.com>
    Cc: Len Brown <lenb@kernel.org>
    Cc: <stable@kernel.org> # Greg, please apply after: cd7240c ("x86, tsc, sched: Recompute cyc2ns_offset's during resume from")
    sleep states
    LKML-Reference: <1284150773.402.122.camel@laptop>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Peter Zijlstra committed with Ingo Molnar Sep 10, 2010
  11. Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/…

    …kernel/git/ickle/drm-intel
    
    * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
      drm/i915: don't enable self-refresh on Ironlake
      drm/i915: Double check that the wait_request is not pending before warning
      Revert "drm/i915: Warn if we run out of FIFO space for a mode"
      Revert "drm/i915: Allow LVDS on pipe A on gen4+"
      Revert "drm/i915: Enable RC6 on Ironlake."
    torvalds committed Sep 11, 2010
  12. Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      xfs: log IO completion workqueue is a high priority queue
      xfs: prevent reading uninitialized stack memory
    torvalds committed Sep 11, 2010
  13. x86, tsc: Fix a preemption leak in restore_sched_clock_state()

    A real life genuine preemption leak..
    
    Reported-and-tested-by: Jeff Chua <jeff.chua.linux@gmail.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Acked-by: Suresh Siddha <suresh.b.siddha@intel.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Peter Zijlstra committed with torvalds Sep 10, 2010
Commits on Sep 10, 2010
  1. PM QoS: Correct pr_debug() misuse and improve parameter checks

    Correct some pr_debug() misuse and add a stronger parameter check to
    pm_qos_write() for the ASCII hex value case.  Thanks to Dan Carpenter
    for pointing out the problem!
    
    Signed-off-by: mark gross <markgross@thegnar.org>
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    mark gross committed with rjwysocki Sep 9, 2010
  2. xfs: log IO completion workqueue is a high priority queue

    The workqueue implementation in 2.6.36-rcX has changed, resulting
    in the workqueues no longer having dedicated threads for work
    processing. This has caused severe livelocks under heavy parallel
    create workloads because the log IO completions have been getting
    held up behind metadata IO completions.  Hence log commits would
    stall, memory allocation would stall because pages could not be
    cleaned, and lock contention on the AIL during inode IO completion
    processing was being seen to slow everything down even further.
    
    By making the log Io completion workqueue a high priority workqueue,
    they are queued ahead of all data/metadata IO completions and
    processed before the data/metadata completions. Hence the log never
    gets stalled, and operations needed to clean memory can continue as
    quickly as possible. This avoids the livelock conditions and allos
    the system to keep running under heavy load as per normal.
    
    Signed-off-by: Dave Chinner <dchinner@redhat.com>
    Reviewed-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Alex Elder <aelder@sgi.com>
    Dave Chinner committed with Alex Elder Sep 8, 2010
  3. execve: make responsive to SIGKILL with large arguments

    An execve with a very large total of argument/environment strings
    can take a really long time in the execve system call.  It runs
    uninterruptibly to count and copy all the strings.  This change
    makes it abort the exec quickly if sent a SIGKILL.
    
    Note that this is the conservative change, to interrupt only for
    SIGKILL, by using fatal_signal_pending().  It would be perfectly
    correct semantics to let any signal interrupt the string-copying in
    execve, i.e. use signal_pending() instead of fatal_signal_pending().
    We'll save that change for later, since it could have user-visible
    consequences, such as having a timer set too quickly make it so that
    an execve can never complete, though it always happened to work before.
    
    Signed-off-by: Roland McGrath <roland@redhat.com>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Roland McGrath committed with torvalds Sep 8, 2010
  4. execve: improve interactivity with large arguments

    This adds a preemption point during the copying of the argument and
    environment strings for execve, in copy_strings().  There is already
    a preemption point in the count() loop, so this doesn't add any new
    points in the abstract sense.
    
    When the total argument+environment strings are very large, the time
    spent copying them can be much more than a normal user time slice.
    So this change improves the interactivity of the rest of the system
    when one process is doing an execve with very large arguments.
    
    Signed-off-by: Roland McGrath <roland@redhat.com>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Roland McGrath committed with torvalds Sep 8, 2010
  5. setup_arg_pages: diagnose excessive argument size

    The CONFIG_STACK_GROWSDOWN variant of setup_arg_pages() does not
    check the size of the argument/environment area on the stack.
    When it is unworkably large, shift_arg_pages() hits its BUG_ON.
    This is exploitable with a very large RLIMIT_STACK limit, to
    create a crash pretty easily.
    
    Check that the initial stack is not too large to make it possible
    to map in any executable.  We're not checking that the actual
    executable (or intepreter, for binfmt_elf) will fit.  So those
    mappings might clobber part of the initial stack mapping.  But
    that is just userland lossage that userland made happen, not a
    kernel problem.
    
    Signed-off-by: Roland McGrath <roland@redhat.com>
    Reviewed-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Roland McGrath committed with torvalds Sep 8, 2010
  6. Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/vir…

    …t/kvm/kvm
    
    * 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: x86: Perform hardware_enable in CPU_STARTING callback
      KVM: i8259: fix migration
      KVM: fix i8259 oops when no vcpus are online
      KVM: x86 emulator: fix regression with cmpxchg8b on i386 hosts
    torvalds committed Sep 10, 2010
  7. 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:
      tracing: t_start: reset FTRACE_ITER_HASH in case of seek/pread
      perf symbols: Fix multiple initialization of symbol system
      perf: Fix CPU hotplug
      perf, trace: Fix module leak
      tracing/kprobe: Fix handling of C-unlike argument names
      tracing/kprobes: Fix handling of argument names
      perf probe: Fix handling of arguments names
      perf probe: Fix return probe support
      tracing/kprobe: Fix a memory leak in error case
      tracing: Do not allow llseek to set_ftrace_filter
    torvalds committed Sep 10, 2010
  8. KEYS: Fix bug in keyctl_session_to_parent() if parent has no session …

    …keyring
    
    Fix a bug in keyctl_session_to_parent() whereby it tries to check the ownership
    of the parent process's session keyring whether or not the parent has a session
    keyring [CVE-2010-2960].
    
    This results in the following oops:
    
      BUG: unable to handle kernel NULL pointer dereference at 00000000000000a0
      IP: [<ffffffff811ae4dd>] keyctl_session_to_parent+0x251/0x443
      ...
      Call Trace:
       [<ffffffff811ae2f3>] ? keyctl_session_to_parent+0x67/0x443
       [<ffffffff8109d286>] ? __do_fault+0x24b/0x3d0
       [<ffffffff811af98c>] sys_keyctl+0xb4/0xb8
       [<ffffffff81001eab>] system_call_fastpath+0x16/0x1b
    
    if the parent process has no session keyring.
    
    If the system is using pam_keyinit then it mostly protected against this as all
    processes derived from a login will have inherited the session keyring created
    by pam_keyinit during the log in procedure.
    
    To test this, pam_keyinit calls need to be commented out in /etc/pam.d/.
    
    Reported-by: Tavis Ormandy <taviso@cmpxchg8b.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Acked-by: Tavis Ormandy <taviso@cmpxchg8b.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    dhowells committed with torvalds Sep 10, 2010
  9. KEYS: Fix RCU no-lock warning in keyctl_session_to_parent()

    There's an protected access to the parent process's credentials in the middle
    of keyctl_session_to_parent().  This results in the following RCU warning:
    
      ===================================================
      [ INFO: suspicious rcu_dereference_check() usage. ]
      ---------------------------------------------------
      security/keys/keyctl.c:1291 invoked rcu_dereference_check() without protection!
    
      other info that might help us debug this:
    
      rcu_scheduler_active = 1, debug_locks = 0
      1 lock held by keyctl-session-/2137:
       #0:  (tasklist_lock){.+.+..}, at: [<ffffffff811ae2ec>] keyctl_session_to_parent+0x60/0x236
    
      stack backtrace:
      Pid: 2137, comm: keyctl-session- Not tainted 2.6.36-rc2-cachefs+ #1
      Call Trace:
       [<ffffffff8105606a>] lockdep_rcu_dereference+0xaa/0xb3
       [<ffffffff811ae379>] keyctl_session_to_parent+0xed/0x236
       [<ffffffff811af77e>] sys_keyctl+0xb4/0xb6
       [<ffffffff81001eab>] system_call_fastpath+0x16/0x1b
    
    The code should take the RCU read lock to make sure the parents credentials
    don't go away, even though it's holding a spinlock and has IRQ disabled.
    
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    dhowells committed with torvalds Sep 10, 2010
  10. Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

    * 'for-linus' of git://git.kernel.dk/linux-2.6-block:
      block: Range check cpu in blk_cpu_to_group
      scatterlist: prevent invalid free when alloc fails
      writeback: Fix lost wake-up shutting down writeback thread
      writeback: do not lose wakeup events when forking bdi threads
      cciss: fix reporting of max queue depth since init
      block: switch s390 tape_block and mg_disk to elevator_change()
      block: add function call to switch the IO scheduler from a driver
      fs/bio-integrity.c: return -ENOMEM on kmalloc failure
      bio-integrity.c: remove dependency on __GFP_NOFAIL
      BLOCK: fix bio.bi_rw handling
      block: put dev->kobj in blk_register_queue fail path
      cciss: handle allocation failure
      cfq-iosched: Documentation help for new tunables
      cfq-iosched: blktrace print per slice sector stats
      cfq-iosched: Implement tunable group_idle
      cfq-iosched: Do group share accounting in IOPS when slice_idle=0
      cfq-iosched: Do not idle if slice_idle=0
      cciss: disable doorbell reset on reset_devices
      blkio: Fix return code for mkdir calls
    torvalds committed Sep 10, 2010
  11. Merge branch 'at91-fixes-for-linus' of git://github.com/at91linux/lin…

    …ux-2.6-at91
    
    * 'at91-fixes-for-linus' of git://github.com/at91linux/linux-2.6-at91:
      AT91: at91sam9261ek: remove C99 comments but keep information
      AT91: at91sam9261ek board: remove warnings related to use of SPI or SD/MMC
      AT91: dm9000 initialization update
      AT91: SAM9G45 - add a separate clock entry for every single TC block
      AT91: clock: peripheral clocks can have other parent than mck
      AT91: change dma resource index
    torvalds committed Sep 10, 2010
  12. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/tiwai/sound-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
      ALSA: rawmidi: fix the get next midi device ioctl
      ALSA: hda - Fix wrong HP pin detection in snd_hda_parse_pin_def_config()
      ALSA: seq/oss - Fix double-free at error path of snd_seq_oss_open()
      ALSA: msnd-classic: Fix invalid cfg parameter
      ALSA: hda - Enable PC-beep for EeePC with ALC269 codec
      ALSA: hda - Add errata initverb sequence for CS42xx codecs
      ALSA: usb - Release capture substream URBs properly
      ALSA: virtuoso: fix setting of Xonar DS line-in/mic-in controls
      ALSA: virtuoso: work around missing reset in the Xonar DS Windows driver
      ALSA: hda - Add quirk for Lenovo T400s
      ALSA: usb-audio: fix detection of vendor-specific device protocol settings
      ALSA: usb-audio: Assume first control interface is for audio
      ALSA: hda - Add a new hp-laptop model for Conexant 5066, tested on HP G60
    torvalds committed Sep 10, 2010
  13. drm/i915: don't enable self-refresh on Ironlake

    We don't know how to enable it safely, especially as outputs turn on and
    off.  When disabling LP1 we also need to make sure LP2 and 3 are already
    disabled.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29173
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=29082
    Reported-by: Chris Lord <chris@linux.intel.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Tested-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Cc: stable@kernel.org
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    jbarnes993 committed with ickle Sep 9, 2010
  14. xfs: prevent reading uninitialized stack memory

    The XFS_IOC_FSGETXATTR ioctl allows unprivileged users to read 12
    bytes of uninitialized stack memory, because the fsxattr struct
    declared on the stack in xfs_ioc_fsgetxattr() does not alter (or zero)
    the 12-byte fsx_pad member before copying it back to the user.  This
    patch takes care of it.
    
    Signed-off-by: Dan Rosenberg <dan.j.rosenberg@gmail.com>
    Reviewed-by: Eric Sandeen <sandeen@redhat.com>
    Signed-off-by: Alex Elder <aelder@sgi.com>
    djrbliss committed with Alex Elder Sep 6, 2010
  15. AT91: at91sam9261ek: remove C99 comments but keep information

    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    noglitch committed Sep 10, 2010
  16. AT91: at91sam9261ek board: remove warnings related to use of SPI or S…

    …D/MMC
    
    The sd/mmc data structure is not used if SPI is selected. The configuration
    of PIO on the board prevent from using both interfaces at the same time
    (board dependent).
    Remove the warnings at compilation time adding a preprocessor condition.
    
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    noglitch committed Sep 10, 2010
  17. AT91: dm9000 initialization update

    Add information in dm9000 mac/phy chip initialization:
    - irq resource details
    - platform data details
    
    Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
    noglitch committed Sep 10, 2010
  18. block: Range check cpu in blk_cpu_to_group

    While testing CPU DLPAR, the following problem was discovered.
    We were DLPAR removing the first CPU, which in this case was
    logical CPUs 0-3. CPUs 0-2 were already marked offline and
    we were in the process of offlining CPU 3. After marking
    the CPU inactive and offline in cpu_disable, but before the
    cpu was completely idle (cpu_die), we ended up in __make_request
    on CPU 3. There we looked at the topology map to see which CPU
    to complete the I/O on and found no CPUs in the cpu_sibling_map.
    This resulted in the block layer setting the completion cpu
    to be NR_CPUS, which then caused an oops when we tried to
    complete the I/O.
    
    Fix this by sanity checking the value we return from blk_cpu_to_group
    to be a valid cpu value.
    
    Signed-off-by: Brian King <brking@linux.vnet.ibm.com>
    Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
    bjking1 committed with Jens Axboe Sep 10, 2010
  19. Merge branch 'tip/perf/urgent' of git://git.kernel.org/pub/scm/linux/…

    …kernel/git/rostedt/linux-2.6-trace into perf/urgent
    Ingo Molnar committed Sep 10, 2010
  20. Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kern…

    …el/git/acme/linux-2.6 into perf/urgent
    Ingo Molnar committed Sep 10, 2010