Various minor changes not fitting elsewhere and not warranting separate
patches.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Index: head-2007-02-27/arch/i386/Kconfig
==================================================================---
head-2007-02-27.orig/arch/i386/Kconfig 2007-03-05 10:00:18.000000000 +0100
+++ head-2007-02-27/arch/i386/Kconfig 2007-02-27 16:27:37.000000000 +0100
@@ -255,7 +255,6 @@ config NR_CPUS
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
Index: head-2007-02-27/arch/i386/kernel/head-xen.S
==================================================================---
head-2007-02-27.orig/arch/i386/kernel/head-xen.S 2007-03-05 10:00:18.000000000
+0100
+++ head-2007-02-27/arch/i386/kernel/head-xen.S 2007-03-02 15:33:04.000000000
+0100
@@ -65,9 +65,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
Index: head-2007-02-27/arch/i386/kernel/process-xen.c
==================================================================---
head-2007-02-27.orig/arch/i386/kernel/process-xen.c 2007-03-05
10:00:18.000000000 +0100
+++ head-2007-02-27/arch/i386/kernel/process-xen.c 2007-02-27 16:27:37.000000000
+0100
@@ -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;
Index: head-2007-02-27/include/asm-i386/mach-xen/asm/system.h
==================================================================---
head-2007-02-27.orig/include/asm-i386/mach-xen/asm/system.h 2007-03-05
10:00:18.000000000 +0100
+++ head-2007-02-27/include/asm-i386/mach-xen/asm/system.h 2007-02-27
16:27:37.000000000 +0100
@@ -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
Index: head-2007-02-27/include/asm-i386/thread_info.h
==================================================================---
head-2007-02-27.orig/include/asm-i386/thread_info.h 2007-03-05
10:00:18.000000000 +0100
+++ head-2007-02-27/include/asm-i386/thread_info.h 2007-02-27 16:27:37.000000000
+0100
@@ -158,7 +158,11 @@ static inline struct thread_info *curren
#define _TIF_ALLWORK_MASK (0x0000FFFF & ~_TIF_SECCOMP)
/* flags to check in __switch_to() */
+#ifndef CONFIG_XEN
#define _TIF_WORK_CTXSW (_TIF_DEBUG|_TIF_IO_BITMAP)
+#else
+#define _TIF_WORK_CTXSW _TIF_DEBUG
+#endif
/*
* Thread-synchronous status.
Index: head-2007-02-27/arch/x86_64/Kconfig
==================================================================---
head-2007-02-27.orig/arch/x86_64/Kconfig 2007-03-05 10:00:18.000000000 +0100
+++ head-2007-02-27/arch/x86_64/Kconfig 2007-02-27 16:27:37.000000000 +0100
@@ -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
Index: head-2007-02-27/include/asm-i386/mach-xen/asm/page.h
==================================================================---
head-2007-02-27.orig/include/asm-i386/mach-xen/asm/page.h 2007-03-05
10:00:18.000000000 +0100
+++ head-2007-02-27/include/asm-i386/mach-xen/asm/page.h 2007-02-27
16:27:37.000000000 +0100
@@ -225,8 +225,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>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel