ac/control: Check for linux/major.h

Signed-off-by: Daniel Stodden <daniel.stodden@citrix.com>

diff --git a/configure.ac b/configure.ac
index b23a74157ae8906c9a5b262900406e59aab04c5f..c0ab69a39968c3afa010ba2fb27a6ad5344b9201 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -13,6 +13,7 @@ AC_CHECK_HEADERS([uuid/uuid.h], [], [Need uuid-dev])
 AC_CHECK_HEADERS([libaio.h], [], [Need libaio-dev])
 AC_CHECK_HEADERS([endian.h])
 AC_CHECK_HEADERS([sys/endian.h])
+AC_CHECK_HEADERS([linux/major.h])
 
 AC_ARG_WITH([libiconv],
             [AS_HELP_STRING([--with-libiconv],

diff --git a/control/tap-ctl-allocate.c b/control/tap-ctl-allocate.c
index 8a6471e987a4e655b7ee7f110b4bff5600be7805..c11c20f1f1166c4a7dbb6e6fe02277cd31bf4925 100644 (file)
--- a/control/tap-ctl-allocate.c
+++ b/control/tap-ctl-allocate.c
@@ -36,7 +36,11 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
+
+#ifdef HAVE_LINUX_MAJOR_H
 #include <linux/major.h>
+#define BLKTAP_CONTROL_MAJOR MISC_MAJOR
+#endif
 
 #include "tap-ctl.h"
 #include "blktap2.h"
@@ -140,7 +144,7 @@ tap_ctl_check_environment(void)
        while (fscanf(f, "%d %256s", &minor, name) == 2)
                if (!strcmp(name, BLKTAP2_CONTROL_NAME)) {
                        err = tap_ctl_make_device(BLKTAP2_CONTROL_DEVICE,
-                                                 MISC_MAJOR,
+                                                 BLKTAP_CONTROL_MAJOR,
                                                  minor, S_IFCHR | 0600);
                        goto out;
                }