[Xen-changelog] [xen-unstable] linux 2.6.18: miscellaneous

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1173103031 0
# Node ID bd66af1b5df2ae99b887fc4f0c9a8a22b9c198c6
# Parent  b1f33c3a97faf28bb021eac69161361d07467a5c
linux 2.6.18: miscellaneous

Various minor changes not fitting elsewhere and not warranting
separate patches.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 linux-2.6-xen-sparse/arch/i386/Kconfig                      |    1 -
 linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S            |    3 ---
 linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c         |    3 ++-
 linux-2.6-xen-sparse/arch/x86_64/Kconfig                    |    2 +-
 linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h   |    2 --
 linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h |    2 +-
 6 files changed, 4 insertions(+), 9 deletions(-)

diff -r b1f33c3a97fa -r bd66af1b5df2 linux-2.6-xen-sparse/arch/i386/Kconfig
--- a/linux-2.6-xen-sparse/arch/i386/Kconfig    Mon Mar 05 13:49:11 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/Kconfig    Mon Mar 05 13:57:11 2007 +0000
@@ -255,7 +255,6 @@ config SCHED_SMT
 config SCHED_SMT
        bool "SMT (Hyperthreading) scheduler support"
        depends on X86_HT
-       depends on !X86_XEN
        help
          SMT scheduler support improves the CPU scheduler's decision making
          when dealing with Intel Pentium 4 chips with HyperThreading at a
diff -r b1f33c3a97fa -r bd66af1b5df2 
linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S
--- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S  Mon Mar 05 13:49:11 
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S  Mon Mar 05 13:57:11 
2007 +0000
@@ -64,9 +64,6 @@ ENTRY(startup_32)
 
        pushl %eax              # fake return address
        jmp start_kernel
-L6:
-       jmp L6                  # main should never return here, but
-                               # just in case, we know what happens.
 
 #define HYPERCALL_PAGE_OFFSET 0x1000
 .org HYPERCALL_PAGE_OFFSET
diff -r b1f33c3a97fa -r bd66af1b5df2 
linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c       Mon Mar 05 
13:49:11 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c       Mon Mar 05 
13:57:11 2007 +0000
@@ -605,7 +605,8 @@ struct task_struct fastcall * __switch_t
                mcl++;
        }
 
-       if (unlikely(prev->io_bitmap_ptr || next->io_bitmap_ptr)) {
+       if (unlikely(test_tsk_thread_flag(prev_p, TIF_IO_BITMAP)
+                    || test_tsk_thread_flag(next_p, TIF_IO_BITMAP))) {
                iobmp_op.bitmap   = (char *)next->io_bitmap_ptr;
                iobmp_op.nr_ports = next->io_bitmap_ptr ? IO_BITMAP_BITS : 0;
                mcl->op      = __HYPERVISOR_physdev_op;
diff -r b1f33c3a97fa -r bd66af1b5df2 linux-2.6-xen-sparse/arch/x86_64/Kconfig
--- a/linux-2.6-xen-sparse/arch/x86_64/Kconfig  Mon Mar 05 13:49:11 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/Kconfig  Mon Mar 05 13:57:11 2007 +0000
@@ -450,7 +450,7 @@ config CALGARY_IOMMU
        bool "IBM Calgary IOMMU support"
        default y
        select SWIOTLB
-       depends on PCI && EXPERIMENTAL
+       depends on PCI && !X86_64_XEN && EXPERIMENTAL
        help
          Support for hardware IOMMUs in IBM's xSeries x366 and x460
          systems. Needed to run systems with more than 3GB of memory
diff -r b1f33c3a97fa -r bd66af1b5df2 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Mon Mar 05 
13:49:11 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Mon Mar 05 
13:57:11 2007 +0000
@@ -226,8 +226,6 @@ extern int page_is_ram(unsigned long pag
        ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
-#define __HAVE_ARCH_GATE_AREA 1
-
 #include <asm-generic/memory_model.h>
 #include <asm-generic/page.h>
 
diff -r b1f33c3a97fa -r bd66af1b5df2 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h       Mon Mar 
05 13:49:11 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h       Mon Mar 
05 13:57:11 2007 +0000
@@ -137,7 +137,7 @@ __asm__ __volatile__ ("movw %%dx,%1\n\t"
 })
 
 #define write_cr4(x) \
-       __asm__ __volatile__("movl %0,%%cr4": :"r" (x));
+       __asm__ __volatile__("movl %0,%%cr4": :"r" (x))
 
 /*
  * Clear and set 'TS' bit respectively

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog