From 264e0d32b1c11913f64cb222d8ad4ccbf3e8cebd Mon Sep 17 00:00:00 2001
From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 9 Jun 2010 06:58:55 +0100
Subject: [PATCH] blktap2: <sys/time.h> is needed for 'struct timeval'

Also clean up a Makefile to use $(SBINDIR).

Signed-off-by: Christoph Egger <Christoph.Egger@amd.com>
---
 tools/blktap2/control/Makefile    | 5 ++---
 tools/blktap2/include/blktaplib.h | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/blktap2/control/Makefile b/tools/blktap2/control/Makefile
index 68b4285ba8..95cfc1bce4 100644
--- a/tools/blktap2/control/Makefile
+++ b/tools/blktap2/control/Makefile
@@ -2,7 +2,6 @@ XEN_ROOT := ../../../
 include $(XEN_ROOT)/tools/Rules.mk
 
 IBIN               = tap-ctl
-INST_DIR           = /usr/sbin
 
 CFLAGS            += -Werror
 CFLAGS            += -Wno-unused
@@ -45,8 +44,8 @@ libblktapctl.a: $(CTL_OBJS)
 	ar r $@ $^
 
 install: all
-	$(INSTALL_DIR) -p $(DESTDIR)$(INST_DIR)
-	$(INSTALL_PROG) $(IBIN) $(DESTDIR)$(INST_DIR)
+	$(INSTALL_DIR) -p $(DESTDIR)$(SBINDIR)
+	$(INSTALL_PROG) $(IBIN) $(DESTDIR)$(SBINDIR)
 
 clean:
 	rm -f $(OBJS) $(DEPS) $(IBIN) $(LIBS)
diff --git a/tools/blktap2/include/blktaplib.h b/tools/blktap2/include/blktaplib.h
index afd1037352..c2860b7c3b 100644
--- a/tools/blktap2/include/blktaplib.h
+++ b/tools/blktap2/include/blktaplib.h
@@ -33,6 +33,7 @@
 #define __BLKTAPLIB_H__
 
 #include <syslog.h>
+#include <sys/time.h>
 #include <xenctrl.h>
 #include <xen/io/blkif.h>
 
-- 
2.39.5