[Xen-devel] [PATCH] fix 32 pv-on-hvm compiling error

["Yang, Xiaowei" <xiaowei.yang@xxxxxxxxx>]

- Macro in xen specific page.h is needed by maddr.h, so symbol link it.
- Override pristine linux headers with xen specific ones of the same
name (not sure of this change).

diff -r ea457d9d3fb2 unmodified_drivers/linux-2.6/mkbuildtree
--- a/unmodified_drivers/linux-2.6/mkbuildtree  Mon Nov 20 16:59:07 2006
+++ b/unmodified_drivers/linux-2.6/mkbuildtree  Thu Nov 23 14:15:38 2006
@@ -49,6 +49,7 @@
     ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypervisor.h include/asm
     ln -sf ${XL}/include/asm-i386/mach-xen/asm/hypercall.h include/asm
     ln -sf ${XL}/include/asm-i386/mach-xen/asm/synch_bitops.h
include/asm
+    ln -sf ${XL}/include/asm-i386/mach-xen/asm/page.h include/asm
     ln -sf ${XL}/include/asm-i386/mach-xen/asm/maddr.h include/asm
   ;;
 "ia64")
diff -r ea457d9d3fb2 unmodified_drivers/linux-2.6/overrides.mk
--- a/unmodified_drivers/linux-2.6/overrides.mk Mon Nov 20 16:59:07 2006
+++ b/unmodified_drivers/linux-2.6/overrides.mk Thu Nov 23 14:15:38 2006
@@ -9,4 +9,5 @@
 EXTRA_CFLAGS += -DCONFIG_XEN_BLKDEV_GRANT -DXEN_EVTCHN_MASK_OPS
 EXTRA_CFLAGS += -DCONFIG_XEN_NETDEV_GRANT_RX
-DCONFIG_XEN_NETDEV_GRANT_TX
 EXTRA_CFLAGS += -D__XEN_INTERFACE_VERSION__=0x00030202
-EXTRA_CFLAGS += -I$(M)/include -I$(M)/compat-include
-DHAVE_XEN_PLATFORM_COMPAT_H
+EXTRA_CFLAGS += -DHAVE_XEN_PLATFORM_COMPAT_H
+CPPFLAGS := -I$(M)/include $(CPPFLAGS) -I$(M)/compat-include

Thanks, 
Xiaowei 

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