1. 07 May, 2008 20 commits
  2. 05 May, 2008 9 commits
  3. 04 May, 2008 11 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-inttypes · f74d505b
      Linus Torvalds authored
      * 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
      f74d505b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes · 45ea2103
      Linus Torvalds authored
      * '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
      45ea2103
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes · 10ea18f0
      Linus Torvalds authored
      * 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
      10ea18f0
    • Bryan Wu's avatar
      task_nommu: fix compile failing bug because of spilt file.h · eb28062f
      Bryan Wu authored
      
      
        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: default avatarBryan Wu <cooloney@kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      eb28062f
    • Linus Torvalds's avatar
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates-2.6.26' of git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm · 8dcf5782
      Linus Torvalds authored
      * '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
      8dcf5782
    • Ingo Molnar's avatar
      sysfs: build fix · e73b65f1
      Ingo Molnar authored
      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-g2850699c, "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-g1cbfb7a5
      
      .
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      e73b65f1
    • Linus Torvalds's avatar
      Make forced module loading optional · 826e4506
      Linus Torvalds authored
      
      
      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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      826e4506
    • Adrian Bunk's avatar
      fix asm-mips/types.h syntax error · 2961b423
      Adrian Bunk authored
      This patch fixes the following compile error caused by
      commit 23cf11dd
      
      
      (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: default avatarAdrian Bunk <bunk@kernel.org>
      Cc: Ralf Baechle <ralf@linux-mips.org>
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      2961b423
    • Adrian Bunk's avatar
      fix asm-alpha/types.h breakage · 36bbfe2f
      Adrian Bunk authored
      This patch fixes the following compile error on alpha caused by
      commit 3726c23d
      
      
      (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: default avatarH. Peter Anvin <hpa@zytor.com>
      36bbfe2f
    • Adrian Bunk's avatar
      kconfig-language.txt: remove bogus hint · 2cb1e125
      Adrian Bunk authored
      
      
      For the use case the hint describe a simple dependency is
      enough.
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Acked-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      2cb1e125