2 files changed, 55 insertions, 17 deletions

diff --git a/include/rdma/uverbs_std_types.h b/include/rdma/uverbs_std_types.h
index bef74099b7c5..400efe2a4d3c 100644
--- a/include/rdma/uverbs_std_types.h
+++ b/include/rdma/uverbs_std_types.h
@@ -34,23 +34,7 @@
 #define _UVERBS_STD_TYPES__
 
 #include <rdma/uverbs_types.h>
-
-enum uverbs_default_objects {
-        UVERBS_OBJECT_DEVICE, /* No instances of DEVICE are allowed */
-        UVERBS_OBJECT_PD,
-        UVERBS_OBJECT_COMP_CHANNEL,
-        UVERBS_OBJECT_CQ,
-        UVERBS_OBJECT_QP,
-        UVERBS_OBJECT_SRQ,
-        UVERBS_OBJECT_AH,
-        UVERBS_OBJECT_MR,
-        UVERBS_OBJECT_MW,
-        UVERBS_OBJECT_FLOW,
-        UVERBS_OBJECT_XRCD,
-        UVERBS_OBJECT_RWQ_IND_TBL,
-        UVERBS_OBJECT_WQ,
-        UVERBS_OBJECT_LAST,
-};
+#include <rdma/ib_user_ioctl_verbs.h>
 
 extern const struct uverbs_object_def uverbs_object_comp_channel;
 extern const struct uverbs_object_def uverbs_object_cq;
diff --git a/include/uapi/rdma/ib_user_ioctl_verbs.h b/include/uapi/rdma/ib_user_ioctl_verbs.h
new file mode 100644
index 000000000000..78a2e5be4d6e
--- /dev/null
+++ b/include/uapi/rdma/ib_user_ioctl_verbs.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, Mellanox Technologies inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef IB_USER_IOCTL_VERBS_H
+#define IB_USER_IOCTL_VERBS_H
+
+enum uverbs_default_objects {
+        UVERBS_OBJECT_DEVICE, /* No instances of DEVICE are allowed */
+        UVERBS_OBJECT_PD,
+        UVERBS_OBJECT_COMP_CHANNEL,
+        UVERBS_OBJECT_CQ,
+        UVERBS_OBJECT_QP,
+        UVERBS_OBJECT_SRQ,
+        UVERBS_OBJECT_AH,
+        UVERBS_OBJECT_MR,
+        UVERBS_OBJECT_MW,
+        UVERBS_OBJECT_FLOW,
+        UVERBS_OBJECT_XRCD,
+        UVERBS_OBJECT_RWQ_IND_TBL,
+        UVERBS_OBJECT_WQ,
+        UVERBS_OBJECT_LAST,
+};
+
+#endif
+