# HG changeset patch
# User kaf24@scramble.cl.cam.ac.uk
# Date 1103104587 0
# Node ID 0cbf74c615954910e2fa617eb20d4089b5e8b004
# Parent  8724fc0ba8383c350e526c3c6c0b5ee910da4e7d# Parent  361671727b96364416e24035b5e28bb669c2231e
bitkeeper revision 1.1159.183.58 (41c00a4bcegoLJhTFK6otLjaxKbuWg)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


diff -r 8724fc0ba838 -r 0cbf74c61595 linux-2.4.28-xen-sparse/arch/xen/mm/init.c
--- a/linux-2.4.28-xen-sparse/arch/xen/mm/init.c	Tue Dec 14 23:00:46 2004 +0000
+++ b/linux-2.4.28-xen-sparse/arch/xen/mm/init.c	Wed Dec 15 09:56:27 2004 +0000
@@ -36,6 +36,10 @@
 #include <asm/apic.h>
 #include <asm/tlb.h>
 
+/* XEN: We *cannot* use mmx_clear_page() this early. Force dumb memset(). */
+#undef clear_page
+#define clear_page(page) memset((void *)(page), 0, PAGE_SIZE)
+
 mmu_gather_t mmu_gathers[NR_CPUS];
 unsigned long highstart_pfn, highend_pfn;
 static unsigned long totalram_pages;