Permalink
Switch branches/tags
Commits on May 5, 2008
  1. Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-int…

    …types
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes:
      fix asm-mips/types.h syntax error
      fix asm-alpha/types.h breakage
    torvalds committed May 5, 2008
  2. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/x86/linux-2.6-x86-fixes
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes:
      x86: fix setup printk format warning
      x86: olpc build fix
      x86: video/fbdev.c: add MODULE_LICENSE
      x86: fix up bootparam.h for userspace inclusion
      x86: relocs ELF handling - use SELFMAG instead of numeric constant
      x86: vdso ELF handling - use SELFMAG instead of numeric constant
      x86: remove dell reboot dmi quirk board name match
      x86: es7000 build fix
      x86: make additional_cpus static
      x86: make start_secondary() static
      kbuild, suspend, x86: fix rebuild of wakeup.bin
      uml: fix gcc problem
      x86: undo visws/numaq build changes
    torvalds committed May 5, 2008
  3. Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

    * git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
      kconfig-language.txt: remove bogus hint
      kconfig: fix MAC OS X warnings in menuconfig
      modpost: i2c aliases need no trailing wildcard
    torvalds committed May 5, 2008
  4. task_nommu: fix compile failing bug because of spilt file.h

      CC      fs/proc/task_nommu.o
    fs/proc/task_nommu.c: In function ‘task_mem’:
    fs/proc/task_nommu.c:55: error: dereferencing pointer to incomplete type
    make[2]: *** [fs/proc/task_nommu.o] Error 1
    make[1]: *** [fs/proc] Error 2
    make: *** [fs] Error 2
    
    Signed-off-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Bryan Wu committed with torvalds May 4, 2008
  5. Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6:
      ide: IDE_HFLAG_SERIALIZE_DMA bugfix
    torvalds committed May 5, 2008
  6. Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/lin…

    …ux/kernel/git/avi/kvm
    
    * 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm:
      x86: KVM geust: make setup_secondary_clock definition dependent on local apic
      KVM: MMU: Allow more than PAGES_PER_HPAGE write protections per large page
      KVM: avoid fx_init() schedule in atomic
      KVM: Avoid spurious execeptions after setting registers
      KVM: PIT: support mode 4
      KVM: x86 emulator: disable writeback on lmsw
      KVM: ppc: deliver INTERRUPT_FP_UNAVAIL to the guest
      KVM: ppc: Handle guest idle by emulating MSR[WE] writes
      KVM: x86: task switch: fix wrong bit setting for the busy flag
      KVM: VMX: Enable EPT feature for KVM
      KVM: VMX: Prepare an identity page table for EPT in real mode
      KVM: Export necessary function for EPT
      KVM: MMU: Remove #ifdef CONFIG_X86_64 to support 4 level EPT
      KVM: MMU: Add EPT support
      KVM: Add kvm_x86_ops get_tdp_level()
      KVM: MMU: Move some definitions to a header file
      KVM: VMX: EPT Feature Detection
    torvalds committed May 5, 2008
  7. sysfs: build fix

    x86.git testing found the following build failure on v2.6.26-rc1:
    
      In file included from include/linux/kobject.h:22,
                       from include/linux/module.h:17,
                       from include/linux/crypto.h:22,
                       from arch/x86/kernel/asm-offsets_32.c:8,
                       from arch/x86/kernel/asm-offsets.c:3:
      include/linux/sysfs.h:201: error: redefinition of 'sysfs_update_group'
      include/linux/sysfs.h:195: error: previous definition of 'sysfs_update_group' was here
      make[1]: *** [arch/x86/kernel/asm-offsets.s] Error 1
      make: *** [prepare0] Error 2
    
    with the following config:
    
        http://redhat.com/~mingo/misc/config-Sun_May__4_07_09_30_CEST_2008.bad
    
    the reason for the build failure is the duplicate definition of the
    sysfs_update_group() inline function in include/linux/sysfs.h.
    
    The duplication was a merge error: it was added via -mm by commit
    v2.6.25-7262-g2850699, "sysfs: sysfs_update_group stub for
    CONFIG_SYSFS=n" a day before v2.6.26-rc1, but a day before that the same
    commit was already merged upstream via the sysfs tree, with commit
    v2.6.25-7211-g1cbfb7a.
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Ingo Molnar committed with torvalds May 4, 2008
  8. Make forced module loading optional

    The kernel module loader used to be much too happy to allow loading of
    modules for the wrong kernel version by default.  For example, if you
    had MODVERSIONS enabled, but tried to load a module with no version
    info, it would happily load it and taint the kernel - whether it was
    likely to actually work or not!
    
    Generally, such forced module loading should be considered a really
    really bad idea, so make it conditional on a new config option
    (MODULE_FORCE_LOAD), and make it default to off.
    
    If somebody really wants to force module loads, that's their problem,
    but we should not encourage it.  Especially as it happened to me by
    mistake (ie regular unversioned Fedora modules getting loaded) causing
    lots of strange behavior.
    
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed May 5, 2008
Commits on May 4, 2008
  1. fix asm-mips/types.h syntax error

    This patch fixes the following compile error caused by
    commit 23cf11d
    (mips: types: use <asm-generic/int-*.h> for the mips architecture):
    
    <--  snip  -->
    
    ...
      CC      kernel/bounds.s
    In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/types.h:12,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/page-flags.h:8,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/kernel/bounds.c:9:
    include2/asm/types.h:56:2: error: #endif without #if
    make[2]: *** [kernel/bounds.s] Error 1
    
    <--  snip  -->
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Cc: Ralf Baechle <ralf@linux-mips.org>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Adrian Bunk committed with H. Peter Anvin May 3, 2008
  2. fix asm-alpha/types.h breakage

    This patch fixes the following compile error on alpha caused by
    commit 3726c23
    (alpha: types: use <asm-generic/int-*.h> for the alpha architecture):
    
    <--  snip  -->
    
    ...
      CC      arch/alpha/kernel/asm-offsets.s
    In file included from include2/asm/topology.h:6,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/topology.h:34,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/mmzone.h:683,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/gfp.h:4,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/slab.h:12,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/percpu.h:5,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/rcupdate.h:39,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/pid.h:4,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/sched.h:74,
                     from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:9:
    include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
    include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
    In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:12:
    include2/asm/io.h:94: warning: type defaults to 'int' in declaration of 'dma_addr_t'
    include2/asm/io.h:94: warning: variable 'dma_addr_t' declared 'inline'
    include2/asm/io.h:94: error: expected ',' or ';' before 'isa_page_to_bus'
    make[2]: *** [arch/alpha/kernel/asm-offsets.s] Error 1
    
    <--  snip  -->
    
    Cc: Richard Henderson <rth@twiddle.net>
    Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    Adrian Bunk committed with H. Peter Anvin May 3, 2008
  3. kconfig-language.txt: remove bogus hint

    For the use case the hint describe a simple dependency is
    enough.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
    Adrian Bunk committed with Sam Ravnborg May 3, 2008
  4. kconfig: fix MAC OS X warnings in menuconfig

    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Acked-by: Timur Tabi <timur@freescale.com>
    Sam Ravnborg committed May 4, 2008
  5. x86: fix setup printk format warning

    Fix x86 setup printk format warming:
    
    next-20080430/arch/x86/kernel/setup.c:172: warning: format '%lu' expects type 'long unsigned int', but argument 2 has type 'ssize_t'
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Cc: mingo@elte.hu
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Randy Dunlap committed with Ingo Molnar May 2, 2008
  6. x86: olpc build fix

    CONFIG_OLPC needs to depend on MGEODE_LX
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Thomas Gleixner committed with Ingo Molnar May 3, 2008
  7. x86: video/fbdev.c: add MODULE_LICENSE

    Add the missing MODULE_LICENSE("GPL").
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Adrian Bunk committed with Ingo Molnar May 2, 2008
  8. x86: fix up bootparam.h for userspace inclusion

    commit 8b664aa (x86, boot: add linked
    list of struct setup_data) put a new struct in bootparam.h, but didn't
    use the userspace-safe types.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Cc: Huang Ying <ying.huang@intel.com>
    Acked-by: H. Peter Anvin <hpa@zytor.com>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    rustyrussell committed with Ingo Molnar May 2, 2008
  9. x86: relocs ELF handling - use SELFMAG instead of numeric constant

    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Cc: akpm@linux-foundation.org
    Cc: hpa@zytor.com
    Cc: mingo@elte.hu
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    cyrillos committed with Ingo Molnar May 3, 2008
  10. x86: vdso ELF handling - use SELFMAG instead of numeric constant

    Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
    Cc: akpm@linux-foundation.org
    Cc: hpa@zytor.com
    Cc: mingo@elte.hu
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    cyrillos committed with Ingo Molnar May 3, 2008
  11. x86: remove dell reboot dmi quirk board name match

    http://bugzilla.kernel.org/show_bug.cgi?id=10547
    
    Newer Dell OptiPlex 745s hang before rebooting after 'sudo reboot'.
    
    A patch for some versions of the OptiPlex was proposed here --
    http://lkml.org/lkml/2007/6/5/59 -- and is included in 2.6.23 and
    later kernels, according to
    http://lxr.linux.no/linux+v2.6.23/arch/i386/kernel/reboot.c . However,
    the DMI_BOARD_NAME ("0WF810") is too restrictive. Newer OptiPlex
    machines have a DMI_BOARD_NAME of "0RF703".  I therefore suggest
    adding another clause to reboot.c, similar to the one in the original
    patch, but matching a DMI_BOARD_NAME of "0RF703".
    
    On further inspection, it seems that there are other DMI_BOARD_NAMEs
    for this same machine. They seem to change from time to time, which
    means that the current code is fragile. Moreover, using bios reboot
    should not break non-SFF OptiPlex 745s, and so a reasonable fix is to
    simply drop the match on DMI_BOARD_NAME.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    beniamino38 committed with Ingo Molnar May 3, 2008
  12. x86: es7000 build fix

    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Ingo Molnar committed May 3, 2008
  13. x86: make additional_cpus static

    This patch makes the needlessly global additional_cpus static.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Adrian Bunk committed with Ingo Molnar Apr 21, 2008
  14. x86: make start_secondary() static

    start_secondary() needlessly became global.
    
    Signed-off-by: Adrian Bunk <bunk@kernel.org>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Adrian Bunk committed with Ingo Molnar Apr 21, 2008
  15. kbuild, suspend, x86: fix rebuild of wakeup.bin

    In kernel/acpi/realmode/Makefile use the 'always'
    variable to say that wakeup.bin should always
    be made.
    
    In acpi/Makefile we then do not need to specify the
    requested target and we avoid the message from make:
    
       `arch/x86/kernel/acpi/realmode/wakeup.bin' is up to date.
    
    Add wakeup.lds to list af targets to avoid rebuilding
    wakeup.bin - from Roland McGrath.
    
    Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
    Cc: Rafael J. Wysocki <rjw@sisk.pl>
    Cc: Pavel Machek <pavel@suse.cz>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Roland McGrath <roland@redhat.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Sam Ravnborg committed with Ingo Molnar May 1, 2008
  16. uml: fix gcc problem

    this is what caused gcc 4.3 to throw an internal error when
    OPTIMIZE_INLINING was enabled ...
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Ingo Molnar committed May 1, 2008
  17. x86: undo visws/numaq build changes

    arch/x86/pci/Makefile_32 has a nasty detail. VISWS and NUMAQ build
    override the generic pci-y rules. This needs a proper cleanup, but
    that needs more thoughts. Undo
    
    commit 895d309
        x86: numaq fix
        do not override the existing pci-y rule when adding visws or
        numaq rules.
    
    There is also a stupid init function ordering problem vs. acpi.o
    
    Add comments to the Makefile to avoid tripping over this again.
    
    Remove the srat stub code in discontig_32.c to allow a proper NUMAQ
    build.
    
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Thomas Gleixner committed with Ingo Molnar May 2, 2008
  18. ide: IDE_HFLAG_SERIALIZE_DMA bugfix

    Patch re-ordering could be harmful:
    
    commit 1fd1890
    Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    Date:   Sat Apr 26 22:25:24 2008 +0200
    
        ide: add IDE_HFLAG_SERIALIZE_DMA host flag
    ...
    
    is buggy because ->init_dma method / ide_hwif_setup_dma() is called
    before IDE_HFLAG_SERIALIZE_DMA host flag is checked.
    
    Fix it by checking IDE_HFLAG_SERIALIZE[_DMA] after DMA initialization.
    
    Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    bzolnier committed May 4, 2008
  19. x86: KVM geust: make setup_secondary_clock definition dependent on lo…

    …cal apic
    
    Since the pv_apic_ops are only present if CONFIG_X86_LOCAL_APIC is compiled
    in, kvmclock failed to build without this option.  This patch fixes this.
    
    Signed-off-by: Glauber Costa <gcosta@redhat.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    Glauber Costa committed with Avi Kivity Apr 30, 2008
  20. KVM: MMU: Allow more than PAGES_PER_HPAGE write protections per large…

    … page
    
    nonpae guests can call rmap_write_protect twice per page (for page tables)
    or four times per page (for page directories), triggering a bogus warning.
    
    Remove the warning.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    Avi Kivity committed May 2, 2008
  21. KVM: avoid fx_init() schedule in atomic

    This make sure not to schedule in atomic during fx_init. I also
    changed the name of fpu_init to fx_finit to avoid duplicating the name
    with fpu_init that is already used in the kernel, this makes grep
    simpler if nothing else.
    
    Signed-off-by: Andrea Arcangeli <andrea@qumranet.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    Andrea Arcangeli committed with Avi Kivity May 1, 2008
  22. KVM: Avoid spurious execeptions after setting registers

    Clear pending exceptions when setting new register values. This avoids
    spurious exceptions after restoring a vcpu state or after
    reset-on-triple-fault.
    
    Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    jan-kiszka committed with Avi Kivity Apr 30, 2008
  23. KVM: PIT: support mode 4

    The in-kernel PIT emulation ignores pending timers if operating under
    mode 4, which for example DragonFlyBSD uses (and Plan9 too, apparently).
    
    Mode 4 seems to be similar to one-shot mode, other than the fact that it
    starts counting after the next CLK pulse once programmed, while mode 1
    starts counting immediately, so add a FIXME to enhance precision.
    
    Fixes sourceforge bug 1952988.
    
    Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
    Acked-by: Sheng Yang <sheng.yang@intel.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    Marcelo Tosatti committed with Avi Kivity Apr 30, 2008
  24. KVM: x86 emulator: disable writeback on lmsw

    The recent changes allowing memory operands with lmsw and smsw left
    lmsw with writeback enabled.  Since lmsw has no oridinary destination
    operand, the dst pointer was not initialized, resulting in an oops.
    
    Close the hole by disabling writeback for lmsw.
    
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    Avi Kivity committed Apr 30, 2008
  25. KVM: ppc: deliver INTERRUPT_FP_UNAVAIL to the guest

    This patch adds the delivery of INTERRUPT_FP_UNAVAIL exceptions to the guest.
    It's needed if a guest uses ppc binaries using the Floating point instructions.
    
    Signed-off-by: Christian Ehrhardt <ehrhardt@linux.vnet.ibm.com>
    Acked-by: Hollis Blanchard <hollisb@us.ibm.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    Christian Ehrhardt committed with Avi Kivity Apr 29, 2008
  26. KVM: ppc: Handle guest idle by emulating MSR[WE] writes

    This reduces host CPU usage when the guest is idle. However, the guest must
    set MSR[WE] in its idle loop, which Linux did not do until 2.6.26.
    
    Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
    Signed-off-by: Jerone Young <jyoung5@us.ibm.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    Hollis Blanchard committed with Avi Kivity Apr 25, 2008
  27. KVM: x86: task switch: fix wrong bit setting for the busy flag

    The busy bit is bit 1 of the type field, not bit 8.
    
    Signed-off-by: Izik Eidus <izike@qumranet.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    Izik Eidus committed with Avi Kivity Apr 28, 2008