1. 10 Dec, 2006 38 commits
  2. 09 Dec, 2006 2 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 · af1713e0
      Linus Torvalds authored
      * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6:
        [PATCH] x86-64: no paravirt for X86_VOYAGER or X86_VISWS
        [PATCH] i386: Fix io_apic.c warning
        [PATCH] i386: export smp_num_siblings for oprofile
        [PATCH] x86: Work around gcc 4.2 over aggressive optimizer
        [PATCH] x86: Fix boot hang due to nmi watchdog init code
        [PATCH] x86: Fix verify_quirk_intel_irqbalance()
        [PATCH] i386: Update defconfig
        [PATCH] x86-64: Update defconfig
      af1713e0
    • Randy Dunlap's avatar
      [PATCH] x86-64: no paravirt for X86_VOYAGER or X86_VISWS · f0f32fcc
      Randy Dunlap authored
      Since Voyager and Visual WS already define ARCH_SETUP,
      it looks like PARAVIRT shouldn't be offered for them.
      
      In file included from arch/i386/kernel/setup.c:63:
      include/asm-i386/mach-visws/setup_arch.h:8:1: warning: "ARCH_SETUP" redefin=
      ed
      In file included from include/asm/msr.h:5,
                       from include/asm/processor.h:17,
                       from include/asm/thread_info.h:16,
                       from include/linux/thread_info.h:21,
                       from include/linux/preempt.h:9,
                       from include/linux/spinlock.h:49,
                       from include/linux/capability.h:45,
                       from include/linux/sched.h:46,
                       from arch/i386/kernel/setup.c:26:
      include/asm/paravirt.h:163:1: warning: this is the location of the previous=
       definition
      In file included from arch/i386/kernel/setup.c:63:
      include/asm-i386/mach-visws/setup_arch.h:8:1: warning: "ARCH_SETUP" redefin=
      ed
      In file included from include/asm/msr.h:5,
                       from include/asm/processor.h:17,
                       from include/asm/thread_info.h:16,
                       from include/linux/thread_info.h:21,
                       from include/linux/preempt.h:9,
                       from include/linux/spinlock.h:49,
                       from include/linux/capability.h:45,
                       from include/linux/sched.h:46,
                       from arch/i386/kernel/setup.c:26:
      include/asm/paravirt.h:163:1: warning: this is the location of the previous=
       definition
      Signed-off-by: default avatarRandy Dunlap <randy.dunlap@oracle.com>
      f0f32fcc