From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoph Egger <Christoph.Egger@amd.com>
Subject: [PATCH] blktap: build fix uncovered with c/s 25149
Date: Tue, 10 Apr 2012 11:56:10 +0200
Message-ID: <4F8403BA.3040904@amd.com>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="------------060904010403020304010403"
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

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


Fix build error uncovered with c/s 25149 when compiling
tools w/o MEMSHR.

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

--------------060904010403020304010403
Content-Type: text/plain; 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 5fb9677f06f9 tools/blktap/drivers/blktapctrl.c
--- a/tools/blktap/drivers/blktapctrl.c	Thu Apr 05 17:41:34 2012 +0200
+++ b/tools/blktap/drivers/blktapctrl.c	Tue Apr 10 11:46:03 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"

--------------060904010403020304010403
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

--------------060904010403020304010403--