From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Egger <Christoph.Egger@amd.com>
Subject: [PATCH] fix build error w/o MEMSHR
Date: Fri, 13 Apr 2012 16:25:00 +0200
Message-ID: <4F88373C.6050007@amd.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------010401020302050809040906"
Return-path: <xen-devel-bounces@lists.xen.org>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: "xen-devel@lists.xen.org" <xen-devel@lists.xen.org>
List-Id: xen-devel@lists.xenproject.org

--------------010401020302050809040906
Content-Type: text/plain; charset="ISO-8859-15"; format=flowed
Content-Transfer-Encoding: 7bit


Do not include memshr.h when MEMSHR is not defined.
Fixes build error when MEMSHR is disabled.

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>

--------------010401020302050809040906
Content-Type: text/plain; charset="us-ascii";
	name="xen_tools_blktapctrl.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="xen_tools_blktapctrl.diff"
Content-Description: xen_tools_blktapctrl.diff

diff -r ab552da976a3 tools/blktap/drivers/blktapctrl.c
--- a/tools/blktap/drivers/blktapctrl.c	Wed Apr 11 18:28:33 2012 +0200
+++ b/tools/blktap/drivers/blktapctrl.c	Fri Apr 13 16:21:11 2012 +0200
@@ -50,7 +50,9 @@
 #include <xs.h>
 #include <sys/time.h>
 #include <syslog.h>
+#ifdef MEMSHR
 #include <memshr.h>
+#endif
 #include <sys/stat.h>
                                                                      
 #include "blktaplib.h"

--------------010401020302050809040906
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel

--------------010401020302050809040906--