[Xen-changelog] Checkin missing hunks from previous commit

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Ian.Campbell@xxxxxxxxxxxxx
# Node ID f1bfe32828a11190bce396766dcc01cf551d3b33
# Parent  60beade30a0c01c998f8fdea4a280d329228ce74
Checkin missing hunks from previous commit

Signed-off-by: Ian Campbell <Ian.Campbell@xxxxxxxxxxxxx>

diff -r 60beade30a0c -r f1bfe32828a1 
linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c Fri Jan 27 11:51:57 2006
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c Fri Jan 27 14:24:50 2006
@@ -995,7 +995,7 @@
         * default LDT is a single-entry callgate to lcall7 for iBCS
         * and a callgate to lcall27 for Solaris/x86 binaries
         */
-       make_lowmem_page_readonly(&default_ldt[0]);
+       make_lowmem_mmu_page_readonly(&default_ldt[0]);
 
        /*
         * Should be a barrier for any external CPU state.
diff -r 60beade30a0c -r f1bfe32828a1 
linux-2.6-xen-sparse/arch/xen/kernel/Makefile
--- a/linux-2.6-xen-sparse/arch/xen/kernel/Makefile     Fri Jan 27 11:51:57 2006
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/Makefile     Fri Jan 27 14:24:50 2006
@@ -11,7 +11,7 @@
 
 extra-y += vmlinux.lds
 
-obj-y   := evtchn.o reboot.o gnttab.o
+obj-y   := evtchn.o reboot.o gnttab.o features.o
 
 obj-$(CONFIG_PROC_FS) += xen_proc.o
 obj-$(CONFIG_NET)     += skbuff.o

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog