Checkin missing hunks from previous commit

Signed-off-by: Ian Campbell <Ian.Campbell@XenSource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c b/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c
index f2669a71a3ec55ef2c5577093ca256242a7a4e77..a9aa782e01d303cf1102d52118741a26d81053e7 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c
+++ b/linux-2.6-xen-sparse/arch/xen/i386/kernel/traps.c
@@ -995,7 +995,7 @@ void __init trap_init(void)
         * 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 --git a/linux-2.6-xen-sparse/arch/xen/kernel/Makefile b/linux-2.6-xen-sparse/arch/xen/kernel/Makefile
index c77d504f3d5e175bb854bc27a8d83e4453c26d87..f08ee4850102b38b22cfe46a8f47df9d2f9c5732 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/kernel/Makefile
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/Makefile
@@ -11,7 +11,7 @@ $(obj)/vmlinux.lds.S:
 
 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