ia64/xen-unstable

changeset 2459:0aadba2b9bc3

bitkeeper revision 1.1159.1.138 (413f3575zU7tYDi_ptlg-r1nAnN1Ww)

Reset PAGE_OFFSET to 0xc0100000 and use VIRT_BASE=0xc0000000.
author cl349@freefall.cl.cam.ac.uk
date Wed Sep 08 16:38:13 2004 +0000 (2004-09-08)
parents d3c0c3c96dc0
children 77bc1f0ea51f
files .rootkeys linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/e820.h linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/page.h linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/processor.h
line diff
     1.1 --- a/.rootkeys	Wed Sep 08 13:17:25 2004 +0000
     1.2 +++ b/.rootkeys	Wed Sep 08 16:38:13 2004 +0000
     1.3 @@ -209,7 +209,6 @@ 3e5a4e65IUfzzMu2kZFlGEB8-rpTaA linux-2.6
     1.4  412f47e4RKD-R5IS5gEXvcT8L4v8gA linux-2.6.8.1-xen-sparse/include/asm-generic/pgtable.h
     1.5  40f56239YAjS52QG2FIAQpHDZAdGHg linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/desc.h
     1.6  4107adf1E5O4ztGHNGMzCCNhcvqNow linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/dma-mapping.h
     1.7 -40f5623anSzpuEHgiNmQ56fIRfCoaQ linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/e820.h
     1.8  40f5623akIoBsQ3KxSB2kufkbgONXQ linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/fixmap.h
     1.9  4118b6a418gnL6AZsTdglC92YGqYTg linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/highmem.h
    1.10  40f5623aJVXQwpJMOLE99XgvGsfQ8Q linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/io.h
     2.1 --- a/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S	Wed Sep 08 13:17:25 2004 +0000
     2.2 +++ b/linux-2.6.8.1-xen-sparse/arch/xen/i386/kernel/head.S	Wed Sep 08 16:38:13 2004 +0000
     2.3 @@ -2,7 +2,7 @@
     2.4  #include <linux/config.h>
     2.5  
     2.6  .section __xen_guest
     2.7 -	.ascii	"GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=2.0"
     2.8 +	.ascii	"GUEST_OS=linux,GUEST_VER=2.6,XEN_VER=2.0,VIRT_BASE=0xC0000000"
     2.9  	.ascii	",LOADER=generic"
    2.10  #ifdef CONFIG_XEN_WRITABLE_PAGETABLES
    2.11  	.ascii	",PT_MODE_WRITABLE"
     3.1 --- a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/e820.h	Wed Sep 08 13:17:25 2004 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,40 +0,0 @@
     3.4 -/*
     3.5 - * structures and definitions for the int 15, ax=e820 memory map
     3.6 - * scheme.
     3.7 - *
     3.8 - * In a nutshell, arch/i386/boot/setup.S populates a scratch table
     3.9 - * in the empty_zero_block that contains a list of usable address/size
    3.10 - * duples.   In arch/i386/kernel/setup.c, this information is
    3.11 - * transferred into the e820map, and in arch/i386/mm/init.c, that
    3.12 - * new information is used to mark pages reserved or not.
    3.13 - *
    3.14 - */
    3.15 -#ifndef __E820_HEADER
    3.16 -#define __E820_HEADER
    3.17 -
    3.18 -#define E820MAP	0x2d0		/* our map */
    3.19 -#define E820MAX	32		/* number of entries in E820MAP */
    3.20 -#define E820NR	0x1e8		/* # entries in E820MAP */
    3.21 -
    3.22 -#define E820_RAM	1
    3.23 -#define E820_RESERVED	2
    3.24 -#define E820_ACPI	3 /* usable as RAM once ACPI tables have been read */
    3.25 -#define E820_NVS	4
    3.26 -
    3.27 -#define HIGH_MEMORY	(0)
    3.28 -
    3.29 -#ifndef __ASSEMBLY__
    3.30 -
    3.31 -struct e820map {
    3.32 -    int nr_map;
    3.33 -    struct e820entry {
    3.34 -	unsigned long long addr;	/* start of memory segment */
    3.35 -	unsigned long long size;	/* size of memory segment */
    3.36 -	unsigned long type;		/* type of memory segment */
    3.37 -    } map[E820MAX];
    3.38 -};
    3.39 -
    3.40 -extern struct e820map e820;
    3.41 -#endif/*!__ASSEMBLY__*/
    3.42 -
    3.43 -#endif/*__E820_HEADER*/
     4.1 --- a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/page.h	Wed Sep 08 13:17:25 2004 +0000
     4.2 +++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/page.h	Wed Sep 08 16:38:13 2004 +0000
     4.3 @@ -170,9 +170,9 @@ static __inline__ int get_order(unsigned
     4.4   *   change TASK_SIZE 
     4.5   */
     4.6  #ifdef __ASSEMBLY__
     4.7 -#define __PAGE_OFFSET		(0xC0100000)
     4.8 +#define __PAGE_OFFSET		(0xC0000000)
     4.9  #else
    4.10 -#define __PAGE_OFFSET		(0xC0100000UL)
    4.11 +#define __PAGE_OFFSET		(0xC0000000UL)
    4.12  #endif
    4.13  
    4.14  
     5.1 --- a/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/processor.h	Wed Sep 08 13:17:25 2004 +0000
     5.2 +++ b/linux-2.6.8.1-xen-sparse/include/asm-xen/asm-i386/processor.h	Wed Sep 08 16:38:13 2004 +0000
     5.3 @@ -217,8 +217,13 @@ static inline void set_in_cr4 (unsigned 
     5.4  	case X86_CR4_OSXMMEXCPT:
     5.5  		break;
     5.6  	default:
     5.7 -		printk("Xen unsupported cr4 update\n");
     5.8 -		BUG();
     5.9 +		do {
    5.10 +			const char *msg = "Xen unsupported cr4 update\n";
    5.11 +			(void)HYPERVISOR_console_io(
    5.12 +				CONSOLEIO_write, __builtin_strlen(msg),
    5.13 +				(char *)msg);
    5.14 +			BUG();
    5.15 +		} while (0);
    5.16  	}
    5.17  }
    5.18  
    5.19 @@ -295,7 +300,7 @@ extern unsigned int mca_pentium_flag;
    5.20  /*
    5.21   * User space process size: 3GB (default).
    5.22   */
    5.23 -#define TASK_SIZE	(PAGE_OFFSET & PGDIR_MASK)
    5.24 +#define TASK_SIZE	(PAGE_OFFSET)
    5.25  
    5.26  /* This decides where the kernel will search for a free chunk of vm
    5.27   * space during mmap's.