ia64/xen-unstable

changeset 14256:bd66af1b5df2

linux 2.6.18: miscellaneous

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

Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Mon Mar 05 13:57:11 2007 +0000 (2007-03-05)
parents b1f33c3a97fa
children 2caed72258e8
files linux-2.6-xen-sparse/arch/i386/Kconfig linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c linux-2.6-xen-sparse/arch/x86_64/Kconfig linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/Kconfig	Mon Mar 05 13:49:11 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/Kconfig	Mon Mar 05 13:57:11 2007 +0000
     1.3 @@ -255,7 +255,6 @@ config NR_CPUS
     1.4  config SCHED_SMT
     1.5  	bool "SMT (Hyperthreading) scheduler support"
     1.6  	depends on X86_HT
     1.7 -	depends on !X86_XEN
     1.8  	help
     1.9  	  SMT scheduler support improves the CPU scheduler's decision making
    1.10  	  when dealing with Intel Pentium 4 chips with HyperThreading at a
     2.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Mon Mar 05 13:49:11 2007 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/head-xen.S	Mon Mar 05 13:57:11 2007 +0000
     2.3 @@ -64,9 +64,6 @@ ENTRY(startup_32)
     2.4  
     2.5  	pushl %eax		# fake return address
     2.6  	jmp start_kernel
     2.7 -L6:
     2.8 -	jmp L6			# main should never return here, but
     2.9 -				# just in case, we know what happens.
    2.10  
    2.11  #define HYPERCALL_PAGE_OFFSET 0x1000
    2.12  .org HYPERCALL_PAGE_OFFSET
     3.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c	Mon Mar 05 13:49:11 2007 +0000
     3.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c	Mon Mar 05 13:57:11 2007 +0000
     3.3 @@ -605,7 +605,8 @@ struct task_struct fastcall * __switch_t
     3.4  		mcl++;
     3.5  	}
     3.6  
     3.7 -	if (unlikely(prev->io_bitmap_ptr || next->io_bitmap_ptr)) {
     3.8 +	if (unlikely(test_tsk_thread_flag(prev_p, TIF_IO_BITMAP)
     3.9 +	             || test_tsk_thread_flag(next_p, TIF_IO_BITMAP))) {
    3.10  		iobmp_op.bitmap   = (char *)next->io_bitmap_ptr;
    3.11  		iobmp_op.nr_ports = next->io_bitmap_ptr ? IO_BITMAP_BITS : 0;
    3.12  		mcl->op      = __HYPERVISOR_physdev_op;
     4.1 --- a/linux-2.6-xen-sparse/arch/x86_64/Kconfig	Mon Mar 05 13:49:11 2007 +0000
     4.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/Kconfig	Mon Mar 05 13:57:11 2007 +0000
     4.3 @@ -450,7 +450,7 @@ config CALGARY_IOMMU
     4.4  	bool "IBM Calgary IOMMU support"
     4.5  	default y
     4.6  	select SWIOTLB
     4.7 -	depends on PCI && EXPERIMENTAL
     4.8 +	depends on PCI && !X86_64_XEN && EXPERIMENTAL
     4.9  	help
    4.10  	  Support for hardware IOMMUs in IBM's xSeries x366 and x460
    4.11  	  systems. Needed to run systems with more than 3GB of memory
     5.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h	Mon Mar 05 13:49:11 2007 +0000
     5.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h	Mon Mar 05 13:57:11 2007 +0000
     5.3 @@ -226,8 +226,6 @@ extern int page_is_ram(unsigned long pag
     5.4  	((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
     5.5  		 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
     5.6  
     5.7 -#define __HAVE_ARCH_GATE_AREA 1
     5.8 -
     5.9  #include <asm-generic/memory_model.h>
    5.10  #include <asm-generic/page.h>
    5.11  
     6.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h	Mon Mar 05 13:49:11 2007 +0000
     6.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/system.h	Mon Mar 05 13:57:11 2007 +0000
     6.3 @@ -137,7 +137,7 @@ extern struct task_struct * FASTCALL(__s
     6.4  })
     6.5  
     6.6  #define write_cr4(x) \
     6.7 -	__asm__ __volatile__("movl %0,%%cr4": :"r" (x));
     6.8 +	__asm__ __volatile__("movl %0,%%cr4": :"r" (x))
     6.9  
    6.10  /*
    6.11   * Clear and set 'TS' bit respectively