diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-03-05 13:57:11 +0000 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-03-05 13:57:11 +0000 |
| commit | 12b8d19b315689013c443f572d9c51854f04c9de (patch) | |
| tree | 8efb5e822bde2d298900b6ac263eb715c0300d11 /linux-2.6-xen-sparse | |
| parent | cd93260c6339829ac8be85facc2aa83b51540821 (diff) | |
| download | xen-12b8d19b315689013c443f572d9c51854f04c9de.tar.gz xen-12b8d19b315689013c443f572d9c51854f04c9de.tar.bz2 xen-12b8d19b315689013c443f572d9c51854f04c9de.zip | |
linux 2.6.18: miscellaneous
Various minor changes not fitting elsewhere and not warranting
separate patches.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Diffstat (limited to 'linux-2.6-xen-sparse')
6 files changed, 4 insertions, 9 deletions
diff --git a/linux-2.6-xen-sparse/arch/i386/Kconfig b/linux-2.6-xen-sparse/arch/i386/Kconfig index 60dff4004e..ac98183863 100644 --- a/linux-2.6-xen-sparse/arch/i386/Kconfig +++ b/linux-2.6-xen-sparse/arch/i386/Kconfig @@ -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 diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S index ff05486f11..2bd3dbfeb0 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S +++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S @@ -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 --git a/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c index 2225fcc962..051e5ab202 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c +++ b/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c @@ -605,7 +605,8 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas 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 --git a/linux-2.6-xen-sparse/arch/x86_64/Kconfig b/linux-2.6-xen-sparse/arch/x86_64/Kconfig index ae0f21a97f..09d6e4f926 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/Kconfig +++ b/linux-2.6-xen-sparse/arch/x86_64/Kconfig @@ -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 --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h index 40d870c3f0..5f7e40d725 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h @@ -226,8 +226,6 @@ extern int page_is_ram(unsigned long pagenr); ((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 --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h index 55b227aa59..37e8a5cc65 100644 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h @@ -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 |