Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Jun 25, 2008
  1. @torvalds

    Linux 2.6.26-rc8

    torvalds authored
  2. @torvalds

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

    torvalds authored
    …it/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] Eliminate NULL test after alloc_bootmem in iosapic_alloc_rte()
      [IA64] Handle count==0 in sn2_ptc_proc_write()
      [IA64] Fix boot failure on ia64/sn2
  3. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes

    torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:
      [GFS2] fix gfs2 block allocation (cleaned up)
      [GFS2] BUG: unable to handle kernel paging request at ffff81002690e000
  4. @torvalds

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

    torvalds authored
    …ux/kernel/git/avi/kvm
    
    * 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
      KVM: Remove now unused structs from kvm_para.h
      x86: KVM guest: Use the paravirt clocksource structs and functions
      KVM: Make kvm host use the paravirt clocksource structs
      x86: Make xen use the paravirt clocksource structs and functions
      x86: Add structs and functions for paravirt clocksource
      KVM: VMX: Fix host msr corruption with preemption enabled
      KVM: ioapic: fix lost interrupt when changing a device's irq
      KVM: MMU: Fix oops on guest userspace access to guest pagetable
      KVM: MMU: large page update_pte issue with non-PAE 32-bit guests (resend)
      KVM: MMU: Fix rmap_write_protect() hugepage iteration bug
      KVM: close timer injection race window in __vcpu_run
      KVM: Fix race between timer migration and vcpu migration
Commits on Jun 24, 2008
  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:
      Revert "[WATCHDOG] hpwdt: Add CFLAGS to get driver working"
  2. @torvalds

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

    torvalds authored
    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      xen: remove support for non-PAE 32-bit
  3. @torvalds

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

    torvalds authored
    …/git/jwessel/linux-2.6-kgdb
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
      kgdb: sparse fix
      kgdb: documentation update - remove kgdboe
  4. @torvalds

    enable bus mastering on i915 at resume time

    Jie Luo authored torvalds committed
    On 9xx chips, bus mastering needs to be enabled at resume time for much of the
    chip to function.  With this patch, vblank interrupts will work as expected
    on resume, along with other chip functions.   Fixes kernel bugzilla #10844.
    
    Signed-off-by: Jie Luo <clotho67@gmail.com>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  5. @kraxel

    KVM: Remove now unused structs from kvm_para.h

    kraxel authored Avi Kivity committed
    The kvm_* structs are obsoleted by the pvclock_* ones.
    Now all users have been switched over and the old structs
    can be dropped.
    
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  6. @kraxel

    x86: KVM guest: Use the paravirt clocksource structs and functions

    kraxel authored Avi Kivity committed
    This patch updates the kvm host code to use the pvclock structs
    and functions, thereby making it compatible with Xen.
    
    The patch also fixes an initialization bug: on SMP systems the
    per-cpu has two different locations early at boot and after CPU
    bringup.  kvmclock must take that in account when registering the
    physical address within the host.
    
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  7. @kraxel

    KVM: Make kvm host use the paravirt clocksource structs

    kraxel authored Avi Kivity committed
    This patch updates the kvm host code to use the pvclock structs.
    It also makes the paravirt clock compatible with Xen.
    
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  8. @kraxel

    x86: Make xen use the paravirt clocksource structs and functions

    kraxel authored Avi Kivity committed
    This patch updates the xen guest to use the pvclock structs
    and helper functions.
    
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  9. @kraxel

    x86: Add structs and functions for paravirt clocksource

    kraxel authored Avi Kivity committed
    This patch adds structs for the paravirt clocksource ABI
    used by both xen and kvm (pvclock-abi.h).
    
    It also adds some helper functions to read system time and
    wall clock time from a paravirtual clocksource (pvclock.[ch]).
    They are based on the xen code.  They are enabled using
    CONFIG_PARAVIRT_CLOCK.
    
    Subsequent patches of this series will put the code in use.
    
    Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
    Acked-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  10. @swhiteho

    [GFS2] fix gfs2 block allocation (cleaned up)

    Benjamin Marzinski authored swhiteho committed
    This patch fixes bz 450641.
    
    This patch changes the computation for zero_metapath_length(), which it
    renames to metapath_branch_start(). When you are extending the metadata
    tree, The indirect blocks that point to the new data block must either
    diverge from the existing tree either at the inode, or at the first
    indirect block. They can diverge at the first indirect block because the
    inode has room for 483 pointers while the indirect blocks have room for
    509 pointers, so when the tree is grown, there is some free space in the
    first indirect block. What metapath_branch_start() now computes is the
    height where the first indirect block for the new data block is located.
    It can either be 1 (if the indirect block diverges from the inode) or 2
    (if it diverges from the first indirect block).
    
    Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  11. @JuliaLawall

    [IA64] Eliminate NULL test after alloc_bootmem in iosapic_alloc_rte()

    JuliaLawall authored Tony Luck committed
    As noted by Akinobu Mita alloc_bootmem and related functions never return
    NULL and always return a zeroed region of memory.  Thus a NULL test or
    memset after calls to these functions is unnecessary.
    
    Signed-off-by: Julia Lawall <julia@diku.dk>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
  12. @cpwickman

    [IA64] Handle count==0 in sn2_ptc_proc_write()

    cpwickman authored Tony Luck committed
    The fix applied in e0c6d97
    "security hole in sn2_ptc_proc_write" didn't take into account
    the case where count==0 (which results in a buffer underrun
    when adding the trailing '\0').  Thanks to Andi Kleen for
    pointing this out.
    
    Signed-off-by: Cliff Wickman <cpw@sgi.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
  13. [IA64] Fix boot failure on ia64/sn2

    Jes Sorensen authored Tony Luck committed
    Call check_sal_cache_flush() after platform_setup() as
    check_sal_cache_flush() now relies on being able to call platform
    vector code.
    
    Problem was introduced by: 3463a93
    "Update check_sal_cache_flush to use platform_send_ipi()"
    
    Signed-off-by: Jes Sorensen <jes@sgi.com>
    Tested-by: Alex Chiang: <achiang@hp.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
  14. @jwessel

    kgdb: sparse fix

    jwessel authored
    - Fix warning reported by sparse
    kernel/kgdb.c:1502:6: warning: symbol 'kgdb_console_write' was not declared.
    	Should it be static?
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  15. @jwessel

    kgdb: documentation update - remove kgdboe

    jwessel authored
    kgdboe is not presently included kgdb, and there should be no
    references to it.
    
    Also fix the tcp port terminal connection example.
    
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
  16. @jsgf

    xen: remove support for non-PAE 32-bit

    jsgf authored Ingo Molnar committed
    Non-PAE operation has been deprecated in Xen for a while, and is
    rarely tested or used.  xen-unstable has now officially dropped
    non-PAE support.  Since Xen/pvops' non-PAE support has also been
    broken for a while, we may as well completely drop it altogether.
    
    Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
  17. @swhiteho

    [GFS2] BUG: unable to handle kernel paging request at ffff81002690e000

    Bob Peterson authored swhiteho committed
    This patch fixes bugzilla bug bz448866: gfs2: BUG: unable to
    handle kernel paging request at ffff81002690e000.
    
    Signed-off-by: Bob Peterson <rpeterso@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
  18. Revert "[WATCHDOG] hpwdt: Add CFLAGS to get driver working"

    Wim Van Sebroeck authored
    After Linus fixed the inline assembly, the CFLAGS option is not
    needed anymore.
    
    Signed-off-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  19. KVM: VMX: Fix host msr corruption with preemption enabled

    Avi Kivity authored
    Switching msrs can occur either synchronously as a result of calls to
    the msr management functions (usually in response to the guest touching
    virtualized msrs), or asynchronously when preempting a kvm thread that has
    guest state loaded.  If we're unlucky enough to have the two at the same
    time, host msrs are corrupted and the machine goes kaput on the next syscall.
    
    Most easily triggered by Windows Server 2008, as it does a lot of msr
    switching during bootup.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  20. KVM: ioapic: fix lost interrupt when changing a device's irq

    Avi Kivity authored
    The ioapic acknowledge path translates interrupt vectors to irqs.  It
    currently uses a first match algorithm, stopping when it finds the first
    redirection table entry containing the vector.  That fails however if the
    guest changes the irq to a different line, leaving the old redirection table
    entry in place (though masked).  Result is interrupts not making it to the
    guest.
    
    Fix by always scanning the entire redirection table.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  21. KVM: MMU: Fix oops on guest userspace access to guest pagetable

    Avi Kivity authored
    KVM has a heuristic to unshadow guest pagetables when userspace accesses
    them, on the assumption that most guests do not allow userspace to access
    pagetables directly. Unfortunately, in addition to unshadowing the pagetables,
    it also oopses.
    
    This never triggers on ordinary guests since sane OSes will clear the
    pagetables before assigning them to userspace, which will trigger the flood
    heuristic, unshadowing the pagetables before the first userspace access. One
    particular guest, though (Xenner) will run the kernel in userspace, triggering
    the oops.  Since the heuristic is incorrect in this case, we can simply
    remove it.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  22. KVM: MMU: large page update_pte issue with non-PAE 32-bit guests (res…

    Marcelo Tosatti authored Avi Kivity committed
    …end)
    
    kvm_mmu_pte_write() does not handle 32-bit non-PAE large page backed
    guests properly. It will instantiate two 2MB sptes pointing to the same
    physical 2MB page when a guest large pte update is trapped.
    
    Instead of duplicating code to handle this, disallow directory level
    updates to happen through kvm_mmu_pte_write(), so the two 2MB sptes
    emulating one guest 4MB pte can be correctly created by the page fault
    handling path.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  23. KVM: MMU: Fix rmap_write_protect() hugepage iteration bug

    Marcelo Tosatti authored Avi Kivity committed
    rmap_next() does not work correctly after rmap_remove(), as it expects
    the rmap chains not to change during iteration.  Fix (for now) by restarting
    iteration from the beginning.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  24. KVM: close timer injection race window in __vcpu_run

    Marcelo Tosatti authored Avi Kivity committed
    If a timer fires after kvm_inject_pending_timer_irqs() but before
    local_irq_disable() the code will enter guest mode and only inject such
    timer interrupt the next time an unrelated event causes an exit.
    
    It would be simpler if the timer->pending irq conversion could be done
    with IRQ's disabled, so that the above problem cannot happen.
    
    For now introduce a new vcpu requests bit to cancel guest entry.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  25. KVM: Fix race between timer migration and vcpu migration

    Marcelo Tosatti authored Avi Kivity committed
    A guest vcpu instance can be scheduled to a different physical CPU
    between the test for KVM_REQ_MIGRATE_TIMER and local_irq_disable().
    
    If that happens, the timer will only be migrated to the current pCPU on
    the next exit, meaning that guest LAPIC timer event can be delayed until
    a host interrupt is triggered.
    
    Fix it by cancelling guest entry if any vcpu request is pending.  This
    has the side effect of nicely consolidating vcpu->requests checks.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
  26. @torvalds

    alpha: fix compile error in arch/alpha/mm/init.c

    Thorsten Kranzkowski authored torvalds committed
    Commit 9267b4b ("alpha: fix module load
    failures on smp (bug #10926)") causes a regression for my ev4
    uniprocessor build:
    
      CC      arch/alpha/mm/init.o
    /export/data/repositories/linux-2.6/arch/alpha/mm/init.c:34: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ before ‘typeof’
    make[2]: *** [arch/alpha/mm/init.o] Error 1
    make[1]: *** [arch/alpha/mm] Error 2
    make: *** [sub-make] Error 2
    
    This fixes it for me (compile and boot tested):
    
    Signed-off-by: Thorsten Kranzkowski <dl8bcu@dl8bcu.de>
    Acked-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Commits on Jun 23, 2008
  1. @torvalds

    Merge branch 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/n…

    torvalds authored
    …fs-2.6
    
    * 'hotfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      NFS: nfs_updatepage(): don't mark page as dirty if an error occurred
      NFS: Fix filehandle size comparisons in the mount code
      NFS: Reduce the NFS mount code stack usage.
  2. NFS: nfs_updatepage(): don't mark page as dirty if an error occurred

    Trond Myklebust authored
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  3. NFS: Fix filehandle size comparisons in the mount code

    Trond Myklebust authored
    Fix a sign issue in xdr_decode_fhstatus3()
    Fix incorrect comparison in nfs_validate_mount_data()
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  4. NFS: Reduce the NFS mount code stack usage.

    Trond Myklebust authored
    This appears to fix the Oops reported in
      http://bugzilla.kernel.org/show_bug.cgi?id=10826
    
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  5. @torvalds

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

    torvalds authored
    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      futexes: fix fault handling in futex_lock_pi
Something went wrong with that request. Please try again.