Skip to content
Commits on Apr 21, 2010
  1. @torvalds

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

    torvalds committed Apr 21, 2010
    …/git/gerg/m68knommu
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
      m68knommu: allow 4 coldfire serial ports
      m68knommu: fix coldfire tcdrain
      m68knommu: remove a duplicate vector setting line for 68360
      Fix m68k-uclinux's rt_sigreturn trampoline
      m68knommu: correct the CC flags for Coldfire M5272 targets
      uclinux: error message when FLAT reloc symbol is invalid, v2
  2. @torvalds

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

    torvalds committed Apr 21, 2010
    …/git/lrg/voltage-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:
      mc13783-regulator: fix a memory leak in mc13783_regulator_remove
      regulator: Let drivers know when they use the stub API
  3. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

    torvalds committed Apr 21, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs:
      [LogFS] Split large truncated into smaller chunks
      [LogFS] Set s_bdi
      [LogFS] Prevent mempool_destroy NULL pointer dereference
      [LogFS] Move assertion
      [LogFS] Plug 8 byte information leak
      [LogFS] Prevent memory corruption on large deletes
      [LogFS] Remove unused method
    
    Fix trivial conflict with added header includes in fs/logfs/super.c
  4. @torvalds

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

    torvalds committed Apr 21, 2010
    …/git/shaggy/jfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6:
      jfs: add jfs specific ->setattr call
      jfs: fix diAllocExt error in resizing filesystem
      jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g
  5. @torvalds

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

    torvalds committed Apr 21, 2010
    …t/kvm/kvm
    
    * 'kvm-updates/2.6.34' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
      KVM: x86: Fix TSS size check for 16-bit tasks
      KVM: Add missing srcu_read_lock() for kvm_mmu_notifier_release()
      KVM: Increase NR_IOBUS_DEVS limit to 200
      KVM: fix the handling of dirty bitmaps to avoid overflows
      KVM: MMU: fix kvm_mmu_zap_page() and its calling path
      KVM: VMX: Save/restore rflags.vm correctly in real mode
      KVM: allow bit 10 to be cleared in MSR_IA32_MC4_CTL
      KVM: Don't spam kernel log when injecting exceptions due to bad cr writes
      KVM: SVM: Fix memory leaks that happen when svm_create_vcpu() fails
      KVM: take srcu lock before call to complete_pio()
  6. @torvalds

    Merge branch 'for-linus' of git://neil.brown.name/md

    torvalds committed Apr 21, 2010
    * 'for-linus' of git://neil.brown.name/md:
      md/raid5: allow for more than 2^31 chunks.
  7. @torvalds

    AFS: Don't pass error value to page_cache_release() in error handling

    David Howells committed with torvalds Apr 21, 2010
    In the error handling in afs_mntpt_do_automount(), we pass an error
    pointer to page_cache_release() if read_mapping_page() failed.  Instead,
    we should extend the gotos around the error handling we don't need.
    
    Reported-by: Dan Carpenter <error27@gmail.com>
    Signed-off-by: David Howells <dhowells@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  8. @jan-kiszka

    KVM: x86: Fix TSS size check for 16-bit tasks

    jan-kiszka committed with Avi Kivity Apr 14, 2010
    A 16-bit TSS is only 44 bytes long. So make sure to test for the correct
    size on task switch.
    
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  9. @laijs

    KVM: Add missing srcu_read_lock() for kvm_mmu_notifier_release()

    laijs committed with Avi Kivity Apr 20, 2010
    I got this dmesg due to srcu_read_lock() is missing in
    kvm_mmu_notifier_release().
    
    ===================================================
    [ INFO: suspicious rcu_dereference_check() usage. ]
    ---------------------------------------------------
    arch/x86/kvm/x86.h:72 invoked rcu_dereference_check() without protection!
    
    other info that might help us debug this:
    
    rcu_scheduler_active = 1, debug_locks = 0
    2 locks held by qemu-system-x86/3100:
     #0:  (rcu_read_lock){.+.+..}, at: [<ffffffff810d73dc>] __mmu_notifier_release+0x38/0xdf
     #1:  (&(&kvm->mmu_lock)->rlock){+.+...}, at: [<ffffffffa0130a6a>] kvm_mmu_zap_all+0x21/0x5e [kvm]
    
    stack backtrace:
    Pid: 3100, comm: qemu-system-x86 Not tainted 2.6.34-rc3-22949-gbc8a97a-dirty #2
    Call Trace:
     [<ffffffff8106afd9>] lockdep_rcu_dereference+0xaa/0xb3
     [<ffffffffa0123a89>] unalias_gfn+0x56/0xab [kvm]
     [<ffffffffa0119600>] gfn_to_memslot+0x16/0x25 [kvm]
     [<ffffffffa012ffca>] gfn_to_rmap+0x17/0x6e [kvm]
     [<ffffffffa01300c1>] rmap_remove+0xa0/0x19d [kvm]
     [<ffffffffa0130649>] kvm_mmu_zap_page+0x109/0x34d [kvm]
     [<ffffffffa0130a7e>] kvm_mmu_zap_all+0x35/0x5e [kvm]
     [<ffffffffa0122870>] kvm_arch_flush_shadow+0x16/0x22 [kvm]
     [<ffffffffa01189e0>] kvm_mmu_notifier_release+0x15/0x17 [kvm]
     [<ffffffff810d742c>] __mmu_notifier_release+0x88/0xdf
     [<ffffffff810d73dc>] ? __mmu_notifier_release+0x38/0xdf
     [<ffffffff81040848>] ? exit_mm+0xe0/0x115
     [<ffffffff810c2cb0>] exit_mmap+0x2c/0x17e
     [<ffffffff8103c472>] mmput+0x2d/0xd4
     [<ffffffff81040870>] exit_mm+0x108/0x115
    [...]
    
    Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  10. @phdm @gregungerer

    m68knommu: allow 4 coldfire serial ports

    phdm committed with gregungerer Mar 18, 2010
    Fix driver/serial/mcf.c for 4-ports coldfire's (e.g. MCF5484).
    
    Signed-off-by: Philippe De Muyter <phdm@macqel.be>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
  11. @phdm @gregungerer

    m68knommu: fix coldfire tcdrain

    phdm committed with gregungerer Apr 2, 2010
    Fix tcdrain on coldfire uarts.
    Currently with coldfire uarts tcdrain returns without waiting for txempty,
    because (tx)fifosize is 0.  Fix that and call uart_update_timeout when
    setting the baud rate, otherwise tcdrain will wait for an half our :)
    Also constify mcf_uart_ops.
    
    Signed-off-by: Philippe De Muyter <phdm@macqel.be>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
  12. @gregungerer

    m68knommu: remove a duplicate vector setting line for 68360

    gregungerer committed Feb 19, 2010
    Remove a duplicate vector setting line for the 68360 interrupt
    setup. Pointed out by Roel Kluin <roel.kluin@gmail.com>
    
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
  13. @gregungerer

    Fix m68k-uclinux's rt_sigreturn trampoline

    Maxim Kuvyrkov committed with gregungerer Sep 23, 2009
    Signed-off-by: Maxim Kuvyrkov <maxim@codesourcery.com>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
  14. @gregungerer

    m68knommu: correct the CC flags for Coldfire M5272 targets

    Philip Nye committed with gregungerer Jan 12, 2010
    Signed-off-by: Philip Nye <philipn@engarts.com>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
  15. @monkey-jsun @gregungerer

    uclinux: error message when FLAT reloc symbol is invalid, v2

    monkey-jsun committed with gregungerer Dec 31, 2009
    This patch fixes a cosmetic error in printk. Text segment and data/bss
    segment are allocated from two different areas. It is not meaningful to
    give the diff between them in the error reporting messages.
    
    Signed-off-by: Jun Sun <jsun@junsun.net>
    Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Commits on Apr 20, 2010
  1. [LogFS] Split large truncated into smaller chunks

    Joern Engel committed Apr 20, 2010
    Truncate would do an almost limitless amount of work without invoking
    the garbage collector in between.  Split it up into more manageable,
    though still large, chunks.
    
    Signed-off-by: Joern Engel <joern@logfs.org>
  2. @torvalds

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

    torvalds committed Apr 20, 2010
    …/git/jack/linux-fs-2.6
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
      quota: Convert __DQUOT_PARANOIA symbol to standard config option
  3. @jankara

    quota: Convert __DQUOT_PARANOIA symbol to standard config option

    jankara committed Apr 19, 2010
    Make __DQUOT_PARANOIA define from the old days a standard config option
    and turn it off by default.
    
    This gets rid of a quota warning about writes before quota is turned on
    for systems with ext4 root filesystem. Currently there's no way to legally
    solve this because /etc/mtab has to be written before quota is turned on
    on most systems.
    
    Signed-off-by: Jan Kara <jack@suse.cz>
  4. @torvalds

    Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds committed Apr 20, 2010
    …t/brodo/pcmcia-2.6
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
      pcmcia: fix error handling in cm4000_cs.c
      drivers/pcmcia: Add missing local_irq_restore
      serial_cs: MD55x support (PCMCIA GPRS/EDGE modem) (kernel 2.6.33)
      pcmcia: avoid late calls to pccard_validate_cis
      pcmcia: fix ioport size calculation in rsrc_nonstatic
      pcmcia: re-start on MFC override
      pcmcia: fix io_probe due to parent (PCI) resources
      pcmcia: use previously assigned IRQ for all card functions
  5. @torvalds

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

    torvalds committed Apr 20, 2010
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix hardirq tracing in trap return path.
      sparc64: Use correct pt_regs in decode_access_size() error paths.
      sparc64: Fix PREEMPT_ACTIVE value.
      sparc64: Run NMIs on the hardirq stack.
      sparc64: Allocate sufficient stack space in ftrace stubs.
      sparc: Fix forgotten kmemleak headers inclusion
  6. @torvalds

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

    torvalds committed Apr 20, 2010
    …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: Fix unsafe frame rewinding with hot regs fetching
  7. @torvalds

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

    torvalds committed Apr 20, 2010
    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm: delay vblank cleanup until after driver unload
  8. @torvalds

    x86: correctly wire up the newuname system call

    Christoph Hellwig committed with torvalds Apr 20, 2010
    Before commit e28cbf2 ("improve
    sys_newuname() for compat architectures") 64-bit x86 had a private
    implementation of sys_uname which was just called sys_uname, which other
    architectures used for the old uname.
    
    Due to some merge issues with the uname refactoring patches we ended up
    calling the old uname version for both the old and new system call
    slots, which lead to the domainname filed never be set which caused
    failures with libnss_nis.
    
    Reported-and-tested-by: Andy Isaacson <adi@hexapodia.org>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  9. KVM: Increase NR_IOBUS_DEVS limit to 200

    Sridhar Samudrala committed with Avi Kivity Mar 30, 2010
    This patch increases the current hardcoded limit of NR_IOBUS_DEVS
    from 6 to 200. We are hitting this limit when creating a guest with more
    than 1 virtio-net device using vhost-net backend. Each virtio-net
    device requires 2 such devices to service notifications from rx/tx queues.
    
    Signed-off-by: Sridhar Samudrala <sri@us.ibm.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  10. KVM: fix the handling of dirty bitmaps to avoid overflows

    Takuya Yoshikawa committed with Avi Kivity Apr 12, 2010
    Int is not long enough to store the size of a dirty bitmap.
    
    This patch fixes this problem with the introduction of a wrapper
    function to calculate the sizes of dirty bitmaps.
    
    Note: in mark_page_dirty(), we have to consider the fact that
      __set_bit() takes the offset as int, not long.
    
    Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  11. KVM: MMU: fix kvm_mmu_zap_page() and its calling path

    Xiao Guangrong committed with Avi Kivity Apr 16, 2010
    This patch fix:
    
    - calculate zapped page number properly in mmu_zap_unsync_children()
    - calculate freeed page number properly kvm_mmu_change_mmu_pages()
    - if zapped children page it shoud restart hlist walking
    
    KVM-Stable-Tag.
    Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  12. KVM: VMX: Save/restore rflags.vm correctly in real mode

    Avi Kivity committed Apr 8, 2010
    Currently we set eflags.vm unconditionally when entering real mode emulation
    through virtual-8086 mode, and clear it unconditionally when we enter protected
    mode.  The means that the following sequence
    
      KVM_SET_REGS  (rflags.vm=1)
      KVM_SET_SREGS (cr0.pe=1)
    
    Ends up with rflags.vm clear due to KVM_SET_SREGS triggering enter_pmode().
    
    Fix by shadowing rflags.vm (and rflags.iopl) correctly while in real mode:
    reads and writes to those bits access a shadow register instead of the actual
    register.
    
    Signed-off-by: Avi Kivity <avi@redhat.com>
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
  13. @aprzywar

    KVM: allow bit 10 to be cleared in MSR_IA32_MC4_CTL

    aprzywar committed with Avi Kivity Mar 24, 2010
    There is a quirk for AMD K8 CPUs in many Linux kernels (see
    arch/x86/kernel/cpu/mcheck/mce.c:__mcheck_cpu_apply_quirks()) that
    clears bit 10 in that MCE related MSR. KVM can only cope with all
    zeros or all ones, so it will inject a #GP into the guest, which
    will let it panic.
    So lets add a quirk to the quirk and ignore this single cleared bit.
    This fixes -cpu kvm64 on all machines and -cpu host on K8 machines
    with some guest Linux kernels.
    
    Signed-off-by: Andre Przywara <andre.przywara@amd.com>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  14. KVM: Don't spam kernel log when injecting exceptions due to bad cr wr…

    Avi Kivity committed Mar 11, 2010
    …ites
    
    These are guest-triggerable.
    
    Signed-off-by: Avi Kivity <avi@redhat.com>
  15. KVM: SVM: Fix memory leaks that happen when svm_create_vcpu() fails

    Takuya Yoshikawa committed with Avi Kivity Mar 9, 2010
    svm_create_vcpu() does not free the pages allocated during the creation
    when it fails to complete the allocations. This patch fixes it.
    
    Signed-off-by: Takuya Yoshikawa <yoshikawa.takuya@oss.ntt.co.jp>
    Signed-off-by: Avi Kivity <avi@redhat.com>
  16. KVM: take srcu lock before call to complete_pio()

    Gleb Natapov committed with Avi Kivity Mar 9, 2010
    complete_pio() may use slot table which is protected by srcu.
    
    Signed-off-by: Gleb Natapov <gleb@redhat.com>
    Cc: stable@kernel.org
    Signed-off-by: Avi Kivity <avi@redhat.com>
  17. @davem330

    sparc64: Fix hardirq tracing in trap return path.

    davem330 committed Apr 20, 2010
    We can overflow the hardirq stack if we set the %pil here
    so early, just let the normal control flow do it.
    
    This is fine as we are allowed to do the actual IRQ enable
    at any point after we call trace_hardirqs_on.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
  18. @jbarnes993

    drm: delay vblank cleanup until after driver unload

    jbarnes993 committed with Dave Airlie Mar 26, 2010
    Drivers may use vblank calls now (e.g. drm_vblank_off) in their unload
    paths, so don't clean up the vblank related structures until after
    driver unload.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
  19. @neilbrown

    md/raid5: allow for more than 2^31 chunks.

    neilbrown committed Apr 20, 2010
    With many large drives and small chunk sizes it is possible
    to create a RAID5 with more than 2^31 chunks.  Make sure this
    works.
    
    Reported-by: Brett King <king.br@gmail.com>
    Signed-off-by: NeilBrown <neilb@suse.de>
    Cc: stable@kernel.org
Commits on Apr 19, 2010
  1. @torvalds

    Linux 2.6.34-rc5

    torvalds committed Apr 19, 2010
Something went wrong with that request. Please try again.