ia64/xen-unstable

changeset 8678:f1bfe32828a1

Checkin missing hunks from previous commit

Signed-off-by: Ian Campbell <Ian.Campbell@XenSource.com>
author Ian.Campbell@xensource.com
date Fri Jan 27 14:24:50 2006 +0000 (2006-01-27)
parents 60beade30a0c
children 98c8afe4c433
files linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c linux-2.6-xen-sparse/arch/xen/kernel/Makefile
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c	Fri Jan 27 11:51:57 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c	Fri Jan 27 14:24:50 2006 +0000
     1.3 @@ -995,7 +995,7 @@ void __init trap_init(void)
     1.4  	 * default LDT is a single-entry callgate to lcall7 for iBCS
     1.5  	 * and a callgate to lcall27 for Solaris/x86 binaries
     1.6  	 */
     1.7 -	make_lowmem_page_readonly(&default_ldt[0]);
     1.8 +	make_lowmem_mmu_page_readonly(&default_ldt[0]);
     1.9  
    1.10  	/*
    1.11  	 * Should be a barrier for any external CPU state.
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/Makefile	Fri Jan 27 11:51:57 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/Makefile	Fri Jan 27 14:24:50 2006 +0000
     2.3 @@ -11,7 +11,7 @@ CPPFLAGS_vmlinux.lds += -U$(XENARCH)
     2.4  
     2.5  extra-y += vmlinux.lds
     2.6  
     2.7 -obj-y   := evtchn.o reboot.o gnttab.o
     2.8 +obj-y   := evtchn.o reboot.o gnttab.o features.o
     2.9  
    2.10  obj-$(CONFIG_PROC_FS) += xen_proc.o
    2.11  obj-$(CONFIG_NET)     += skbuff.o