From b441e8c89bd2514c62f953bee3bb64af2e2b5728 Mon Sep 17 00:00:00 2001
From: Stephen Tweedie <sct@fedoraproject.org>
Date: Jul 13 2006 18:11:48 +0000
Subject: Compile fix: don't #include <linux/compiler.h>


---

diff --git a/xen-compile-fixes.patch b/xen-compile-fixes.patch
index f163974..3c58eed 100644
--- a/xen-compile-fixes.patch
+++ b/xen-compile-fixes.patch
@@ -1,14 +1,10 @@
---- xen-3.0.0/tools/xenmon/xenbaked.c.compile	2005-12-06 09:05:34.000000000 -0500
-+++ xen-3.0.0/tools/xenmon/xenbaked.c	2005-12-06 16:05:24.000000000 -0500
-@@ -549,7 +549,10 @@
-     for (n=0; n<ncpu; n++) {
- 
-       for (i=0; i<sizeof(_new_qos_data); i=i+pgsize)
--        write(qos_fd, dummy, pgsize);
-+        if ((write(qos_fd, dummy, pgsize)) != pgsize) {
-+	  PERROR(SHARED_MEM_FILE);
-+	  exit(2);
-+	}
- 
-       new_qos = (_new_qos_data *) mmap(0, sizeof(_new_qos_data), PROT_READ|PROT_WRITE, 
- 				       MAP_SHARED, qos_fd, off);
+--- xen-unstable.hg/tools/xenstat/libxenstat/src/xenstat.c.~1~	2006-07-13 15:39:15.000000000 +0100
++++ xen-unstable.hg/tools/xenstat/libxenstat/src/xenstat.c	2006-07-13 19:04:59.000000000 +0100
+@@ -20,7 +20,6 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <linux/compiler.h>
+ #include <fcntl.h>
+ #include <dirent.h>
+ #include <sys/types.h>
diff --git a/xen.spec b/xen.spec
index 2300dd5..f9d9d60 100644
--- a/xen.spec
+++ b/xen.spec
@@ -3,7 +3,7 @@
 Summary: Xen is a virtual machine monitor
 Name:    xen
 Version: 3.0.2
-Release: 13
+Release: 14
 Group:   Development/Libraries
 License: GPL
 URL:     http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
@@ -12,6 +12,7 @@ Source2: xenguest-install.py
 Source3: xen-udev.rules
 Patch1: xen-initscript.patch
 Patch2: xen-change-default-nic.patch
+Patch3: xen-compile-fixes.patch
 Patch6: xen-network-iptables-bridge.patch
 Patch8: xen-vmxballoon-hack.patch
 Patch11: xen-3.0.1-cloexec.patch
@@ -78,6 +79,7 @@ virtual machines.
 %setup -q -n xen-unstable.hg
 %patch1 -p1 -b .init
 %patch2 -p1 -b .nic
+%patch3 -p1 -b .compile
 %patch6 -p1
 %patch8 -p1
 #patch11 -p1 -b .cloexec
@@ -190,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.a
 
 %changelog
+* Thu Jul 13 2006 Stephen C. Tweedie <sct@redhat.com> - 3.0.2-14
+- Compile fix: don't #include <linux/compiler.h>
+
 * Thu Jul 13 2006 Stephen C. Tweedie <sct@redhat.com> - 3.0.2-13
 - Update to xen-unstable cset 10675
 - Remove internal libvncserver build, new qemu device model has its own one