[Xen-changelog] [xen-unstable] Check for mismatch between headers shared by Linux and Xen.

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

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1180527020 -3600
# Node ID 1f1d1b43951eb14eff8c71884b7421da2484af3c
# Parent  63211a8027fa994290e23be17f4de9ba3b3e953e
Check for mismatch between headers shared by Linux and Xen.

This is only enabled for the linux-2.6-xen tree and is intended to
ensure that the separate Linux tree stays up to date once we
switch away from the sparse tree.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
---
 buildconfigs/mk.linux-2.6-native     |    3 +++
 buildconfigs/mk.linux-2.6-paravirt   |    2 ++
 buildconfigs/mk.linux-2.6-xen        |    9 +++++++++
 buildconfigs/mk.linux-2.6.5-SLES-xen |    2 ++
 buildconfigs/mk.linux-2.6.9-RHEL-xen |    2 ++
 5 files changed, 18 insertions(+)

diff -r 63211a8027fa -r 1f1d1b43951e buildconfigs/mk.linux-2.6-native
--- a/buildconfigs/mk.linux-2.6-native  Wed May 30 11:55:38 2007 +0100
+++ b/buildconfigs/mk.linux-2.6-native  Wed May 30 13:10:20 2007 +0100
@@ -1,4 +1,7 @@ EXTRAVERSION = -native
 EXTRAVERSION = -native
 IMAGE_TARGET = bzImage
 INSTALL_BOOT_PATH = $(DESTDIR)/boot
+
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
+
 include buildconfigs/mk.linux-2.6-xen
diff -r 63211a8027fa -r 1f1d1b43951e buildconfigs/mk.linux-2.6-paravirt
--- a/buildconfigs/mk.linux-2.6-paravirt        Wed May 30 11:55:38 2007 +0100
+++ b/buildconfigs/mk.linux-2.6-paravirt        Wed May 30 13:10:20 2007 +0100
@@ -6,6 +6,8 @@ XEN_TARGET_ARCH = x86_32
 XEN_TARGET_ARCH = x86_32
 IMAGE_TARGET ?= vmlinux bzImage
 
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
+
 EXTRAVERSION ?=
 
 include buildconfigs/mk.linux-2.6-xen
diff -r 63211a8027fa -r 1f1d1b43951e buildconfigs/mk.linux-2.6-xen
--- a/buildconfigs/mk.linux-2.6-xen     Wed May 30 11:55:38 2007 +0100
+++ b/buildconfigs/mk.linux-2.6-xen     Wed May 30 13:10:20 2007 +0100
@@ -27,6 +27,15 @@ include buildconfigs/src.$(XEN_LINUX_SOU
 # The real action starts here!
 .PHONY: build
 build: $(LINUX_DIR)/include/linux/autoconf.h
+ifneq ($(XEN_LINUX_ALLOW_INTERFACE_MISMATCH),y)
+       @if ! diff -urN -x '*.size' $(LINUX_SRCDIR)/include/xen/interface 
xen/include/public ; then \
+               echo "" 1>&2 ; \
+               echo " *** $(LINUX_SRCDIR)/include/xen/interface is out of date 
" 1>&2 ; \
+               echo " *** relative to $(XEN_ROOT)/xen/include/public." 1>&2 ; \
+               echo "" 1>&2 ; \
+               exit 1 ; \
+       fi
+endif
        if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
            $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) modules ; \
            $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) 
INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \
diff -r 63211a8027fa -r 1f1d1b43951e buildconfigs/mk.linux-2.6.5-SLES-xen
--- a/buildconfigs/mk.linux-2.6.5-SLES-xen      Wed May 30 11:55:38 2007 +0100
+++ b/buildconfigs/mk.linux-2.6.5-SLES-xen      Wed May 30 13:10:20 2007 +0100
@@ -1,6 +1,8 @@
 # This tree only supports PAE
 XEN_TARGET_ARCH = x86_32
 XEN_TARGET_X86_PAE = y
+
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
 
 EXTRAVERSION = -xen
 LINUX_VER = 2.6.5-SLES
diff -r 63211a8027fa -r 1f1d1b43951e buildconfigs/mk.linux-2.6.9-RHEL-xen
--- a/buildconfigs/mk.linux-2.6.9-RHEL-xen      Wed May 30 11:55:38 2007 +0100
+++ b/buildconfigs/mk.linux-2.6.9-RHEL-xen      Wed May 30 13:10:20 2007 +0100
@@ -1,6 +1,8 @@
 # This tree only supports PAE
 XEN_TARGET_ARCH = x86_32
 XEN_TARGET_X86_PAE = y
+
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
 
 EXTRAVERSION = -xen
 LINUX_VER = 2.6.9-RHEL

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