pv-on-hvm: fix for Centos 5.2

From: Yoshisato YANAGISAWA <yanagisawa.yoshisato@lab.ntt.co.jp>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
index fe3dc6de3904498febe3f61deece6cd04620bf18..eceac2a4ff50f2ffe236725d50bd60619f297ce5 100644 (file)
--- a/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
+++ b/unmodified_drivers/linux-2.6/compat-include/xen/platform-compat.h
@@ -147,9 +147,11 @@ extern char *kasprintf(gfp_t gfp, const char *fmt, ...)
  *   RHEL_VERSION
  */
 #if !defined(RHEL_VERSION) || (RHEL_VERSION == 4 && RHEL_UPDATE < 5)
+#if !defined(RHEL_MAJOR) || (RHEL_MAJOR == 4 && RHEL_MINOR < 5)
 typedef irqreturn_t (*irq_handler_t)(int, void *, struct pt_regs *);
 #endif
 #endif
+#endif
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,23)
 #define setup_xen_features xen_setup_features

diff --git a/unmodified_drivers/linux-2.6/overrides.mk b/unmodified_drivers/linux-2.6/overrides.mk
index 7d121ffe2261ee4fe051058fb512b73b749126b2..f30426eb198e6d215beb8306c616bbfd42a807fa 100644 (file)
--- a/unmodified_drivers/linux-2.6/overrides.mk
+++ b/unmodified_drivers/linux-2.6/overrides.mk
@@ -15,3 +15,4 @@ _XEN_CPPFLAGS += -include $(objtree)/include/linux/autoconf.h
 
 EXTRA_CFLAGS += $(_XEN_CPPFLAGS)
 EXTRA_AFLAGS += $(_XEN_CPPFLAGS)
+CPPFLAGS := -I$(M)/include $(CPPFLAGS)