[PATCH] IB: move include files to include/rdma

Move the InfiniBand headers from drivers/infiniband/include to include/rdma. This allows InfiniBand-using code to live elsewhere, and lets us remove the ugly EXTRA_CFLAGS include path from the InfiniBand Makefiles. Signed-off-by: Roland Dreier <rolandd@cisco.com>
2024-11-11 12:28:41 +08:00 · 2005-08-25 13:40:04 -07:00 · 2005-08-25 13:40:04 -07:00 · a4d61e8480
commit a4d61e8480
parent 1ad62a19f1
41 changed files with 51 additions and 57 deletions
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@ -1,5 +1,3 @@
-EXTRA_CFLAGS += -Idrivers/infiniband/include
-
 obj-$(CONFIG_INFINIBAND) +=		ib_core.o ib_mad.o ib_sa.o \
 					ib_cm.o ib_umad.o ib_ucm.o
 obj-$(CONFIG_INFINIBAND_USER_VERBS) +=	ib_uverbs.o
--- a/drivers/infiniband/core/agent.c
+++ b/drivers/infiniband/core/agent.c
@ -41,7 +41,7 @@

 #include <asm/bug.h>

-#include <ib_smi.h>
+#include <rdma/ib_smi.h>

 #include "smi.h"
 #include "agent_priv.h"
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@ -39,7 +39,7 @@
 #include <linux/errno.h>
 #include <linux/slab.h>

-#include <ib_cache.h>
+#include <rdma/ib_cache.h>

 #include "core_priv.h"

--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@ -43,8 +43,8 @@
 #include <linux/spinlock.h>
 #include <linux/workqueue.h>

-#include <ib_cache.h>
-#include <ib_cm.h>
+#include <rdma/ib_cache.h>
+#include <rdma/ib_cm.h>
 #include "cm_msgs.h"

 MODULE_AUTHOR("Sean Hefty");
--- a/drivers/infiniband/core/cm_msgs.h
+++ b/drivers/infiniband/core/cm_msgs.h
@ -34,7 +34,7 @@
 #if !defined(CM_MSGS_H)
 #define CM_MSGS_H

-#include <ib_mad.h>
+#include <rdma/ib_mad.h>

 /*
 * Parameters to routines below should be in network-byte order, and values
--- a/drivers/infiniband/core/core_priv.h
+++ b/drivers/infiniband/core/core_priv.h
@ -38,7 +38,7 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>

-#include <ib_verbs.h>
+#include <rdma/ib_verbs.h>

 int  ib_device_register_sysfs(struct ib_device *device);
 void ib_device_unregister_sysfs(struct ib_device *device);
--- a/drivers/infiniband/core/fmr_pool.c
+++ b/drivers/infiniband/core/fmr_pool.c
@ -39,7 +39,7 @@
 #include <linux/jhash.h>
 #include <linux/kthread.h>

-#include <ib_fmr_pool.h>
+#include <rdma/ib_fmr_pool.h>

 #include "core_priv.h"

--- a/drivers/infiniband/core/mad_priv.h
+++ b/drivers/infiniband/core/mad_priv.h
@ -40,8 +40,8 @@
 #include <linux/pci.h>
 #include <linux/kthread.h>
 #include <linux/workqueue.h>
-#include <ib_mad.h>
-#include <ib_smi.h>
+#include <rdma/ib_mad.h>
+#include <rdma/ib_smi.h>


 #define PFX "ib_mad: "
--- a/drivers/infiniband/core/packer.c
+++ b/drivers/infiniband/core/packer.c
@ -33,7 +33,7 @@
 * $Id: packer.c 1349 2004-12-16 21:09:43Z roland $
 */

-#include <ib_pack.h>
+#include <rdma/ib_pack.h>

 static u64 value_read(int offset, int size, void *structure)
 {
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@ -44,8 +44,8 @@
 #include <linux/kref.h>
 #include <linux/idr.h>

-#include <ib_pack.h>
-#include <ib_sa.h>
+#include <rdma/ib_pack.h>
+#include <rdma/ib_sa.h>

 MODULE_AUTHOR("Roland Dreier");
 MODULE_DESCRIPTION("InfiniBand subnet administration query support");
--- a/drivers/infiniband/core/smi.c
+++ b/drivers/infiniband/core/smi.c
@ -37,7 +37,7 @@
 * $Id: smi.c 1389 2004-12-27 22:56:47Z roland $
 */

-#include <ib_smi.h>
+#include <rdma/ib_smi.h>
 #include "smi.h"

 /*
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@ -36,7 +36,7 @@

 #include "core_priv.h"

-#include <ib_mad.h>
+#include <rdma/ib_mad.h>

 struct ib_port {
 	struct kobject         kobj;
--- a/drivers/infiniband/core/ucm.h
+++ b/drivers/infiniband/core/ucm.h
@ -40,8 +40,8 @@
 #include <linux/cdev.h>
 #include <linux/idr.h>

-#include <ib_cm.h>
-#include <ib_user_cm.h>
+#include <rdma/ib_cm.h>
+#include <rdma/ib_user_cm.h>

 #define IB_UCM_CM_ID_INVALID 0xffffffff

--- a/drivers/infiniband/core/ud_header.c
+++ b/drivers/infiniband/core/ud_header.c
@ -35,7 +35,7 @@

 #include <linux/errno.h>

-#include <ib_pack.h>
+#include <rdma/ib_pack.h>

 #define STRUCT_FIELD(header, field) \
 	.struct_offset_bytes = offsetof(struct ib_unpacked_ ## header, field),      \
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@ -49,8 +49,8 @@
 #include <asm/uaccess.h>
 #include <asm/semaphore.h>

-#include <ib_mad.h>
-#include <ib_user_mad.h>
+#include <rdma/ib_mad.h>
+#include <rdma/ib_user_mad.h>

 MODULE_AUTHOR("Roland Dreier");
 MODULE_DESCRIPTION("InfiniBand userspace MAD packet access");
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
@ -45,8 +45,8 @@
 #include <linux/kref.h>
 #include <linux/idr.h>

-#include <ib_verbs.h>
-#include <ib_user_verbs.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_user_verbs.h>

 struct ib_uverbs_device {
 	int					devnum;
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@ -41,8 +41,8 @@
 #include <linux/errno.h>
 #include <linux/err.h>

-#include <ib_verbs.h>
-#include <ib_cache.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_cache.h>

 /* Protection domains */

--- a/drivers/infiniband/hw/mthca/Makefile
+++ b/drivers/infiniband/hw/mthca/Makefile
@ -1,5 +1,3 @@
-EXTRA_CFLAGS += -Idrivers/infiniband/include
-
 ifdef CONFIG_INFINIBAND_MTHCA_DEBUG
 EXTRA_CFLAGS += -DDEBUG
 endif
--- a/drivers/infiniband/hw/mthca/mthca_av.c
+++ b/drivers/infiniband/hw/mthca/mthca_av.c
@ -35,8 +35,8 @@

 #include <linux/init.h>

-#include <ib_verbs.h>
-#include <ib_cache.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_cache.h>

 #include "mthca_dev.h"

--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@ -37,7 +37,7 @@
 #include <linux/pci.h>
 #include <linux/errno.h>
 #include <asm/io.h>
-#include <ib_mad.h>
+#include <rdma/ib_mad.h>

 #include "mthca_dev.h"
 #include "mthca_config_reg.h"
--- a/drivers/infiniband/hw/mthca/mthca_cmd.h
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.h
@ -36,7 +36,7 @@
 #ifndef MTHCA_CMD_H
 #define MTHCA_CMD_H

-#include <ib_verbs.h>
+#include <rdma/ib_verbs.h>

 #define MTHCA_MAILBOX_SIZE 4096

--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
@ -39,7 +39,7 @@
 #include <linux/init.h>
 #include <linux/hardirq.h>

-#include <ib_pack.h>
+#include <rdma/ib_pack.h>

 #include "mthca_dev.h"
 #include "mthca_cmd.h"
--- a/drivers/infiniband/hw/mthca/mthca_mad.c
+++ b/drivers/infiniband/hw/mthca/mthca_mad.c
@ -34,9 +34,9 @@
 * $Id: mthca_mad.c 1349 2004-12-16 21:09:43Z roland $
 */

-#include <ib_verbs.h>
-#include <ib_mad.h>
-#include <ib_smi.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_mad.h>
+#include <rdma/ib_smi.h>

 #include "mthca_dev.h"
 #include "mthca_cmd.h"
--- a/drivers/infiniband/hw/mthca/mthca_provider.c
+++ b/drivers/infiniband/hw/mthca/mthca_provider.c
@ -36,7 +36,7 @@
 * $Id: mthca_provider.c 1397 2004-12-28 05:09:00Z roland $
 */

-#include <ib_smi.h>
+#include <rdma/ib_smi.h>
 #include <linux/mm.h>

 #include "mthca_dev.h"
--- a/drivers/infiniband/hw/mthca/mthca_provider.h
+++ b/drivers/infiniband/hw/mthca/mthca_provider.h
@ -37,8 +37,8 @@
 #ifndef MTHCA_PROVIDER_H
 #define MTHCA_PROVIDER_H

-#include <ib_verbs.h>
-#include <ib_pack.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_pack.h>

 #define MTHCA_MPT_FLAG_ATOMIC        (1 << 14)
 #define MTHCA_MPT_FLAG_REMOTE_WRITE  (1 << 13)
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@ -37,9 +37,9 @@

 #include <linux/init.h>

-#include <ib_verbs.h>
-#include <ib_cache.h>
-#include <ib_pack.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_cache.h>
+#include <rdma/ib_pack.h>

 #include "mthca_dev.h"
 #include "mthca_cmd.h"
--- a/drivers/infiniband/ulp/ipoib/Makefile
+++ b/drivers/infiniband/ulp/ipoib/Makefile
@ -1,5 +1,3 @@
-EXTRA_CFLAGS += -Idrivers/infiniband/include
-
 obj-$(CONFIG_INFINIBAND_IPOIB)			+= ib_ipoib.o

 ib_ipoib-y					:= ipoib_main.o \
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@ -51,9 +51,9 @@
 #include <asm/atomic.h>
 #include <asm/semaphore.h>

-#include <ib_verbs.h>
-#include <ib_pack.h>
-#include <ib_sa.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_pack.h>
+#include <rdma/ib_sa.h>

 /* constants */

--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@ -38,7 +38,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>

-#include <ib_cache.h>
+#include <rdma/ib_cache.h>

 #include "ipoib.h"

--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@ -33,7 +33,7 @@
 * $Id: ipoib_verbs.c 1349 2004-12-16 21:09:43Z roland $
 */

-#include <ib_cache.h>
+#include <rdma/ib_cache.h>

 #include "ipoib.h"

--- a/drivers/infiniband/include/ib_cache.h
+++ b/drivers/infiniband/include/ib_cache.h
@ -37,7 +37,7 @@
 #ifndef _IB_CACHE_H
 #define _IB_CACHE_H

-#include <ib_verbs.h>
+#include <rdma/ib_verbs.h>

 /**
 * ib_get_cached_gid - Returns a cached GID table entry
--- a/drivers/infiniband/include/ib_cm.h
+++ b/drivers/infiniband/include/ib_cm.h
@ -37,8 +37,8 @@
 #if !defined(IB_CM_H)
 #define IB_CM_H

-#include <ib_mad.h>
-#include <ib_sa.h>
+#include <rdma/ib_mad.h>
+#include <rdma/ib_sa.h>

 enum ib_cm_state {
 	IB_CM_IDLE,
--- a/drivers/infiniband/include/ib_fmr_pool.h
+++ b/drivers/infiniband/include/ib_fmr_pool.h
@ -36,7 +36,7 @@
 #if !defined(IB_FMR_POOL_H)
 #define IB_FMR_POOL_H

-#include <ib_verbs.h>
+#include <rdma/ib_verbs.h>

 struct ib_fmr_pool;

--- a/drivers/infiniband/include/ib_mad.h
+++ b/drivers/infiniband/include/ib_mad.h
@ -41,7 +41,7 @@

 #include <linux/pci.h>

-#include <ib_verbs.h>
+#include <rdma/ib_verbs.h>

 /* Management base version */
 #define IB_MGMT_BASE_VERSION			1
--- a/drivers/infiniband/include/ib_pack.h
+++ b/drivers/infiniband/include/ib_pack.h
@ -35,7 +35,7 @@
 #ifndef IB_PACK_H
 #define IB_PACK_H

-#include <ib_verbs.h>
+#include <rdma/ib_verbs.h>

 enum {
 	IB_LRH_BYTES  = 8,
--- a/drivers/infiniband/include/ib_sa.h
+++ b/drivers/infiniband/include/ib_sa.h
@ -38,8 +38,8 @@

 #include <linux/compiler.h>

-#include <ib_verbs.h>
-#include <ib_mad.h>
+#include <rdma/ib_verbs.h>
+#include <rdma/ib_mad.h>

 enum {
 	IB_SA_CLASS_VERSION		= 2,	/* IB spec version 1.1/1.2 */
--- a/drivers/infiniband/include/ib_smi.h
+++ b/drivers/infiniband/include/ib_smi.h
@ -39,7 +39,7 @@
 #if !defined( IB_SMI_H )
 #define IB_SMI_H

-#include <ib_mad.h>
+#include <rdma/ib_mad.h>

 #define IB_SMP_DATA_SIZE			64
 #define IB_SMP_MAX_PATH_HOPS			64
--- a/drivers/infiniband/include/ib_user_cm.h
+++ b/drivers/infiniband/include/ib_user_cm.h
--- a/drivers/infiniband/include/ib_user_mad.h
+++ b/drivers/infiniband/include/ib_user_mad.h
--- a/drivers/infiniband/include/ib_user_verbs.h
+++ b/drivers/infiniband/include/ib_user_verbs.h
--- a/drivers/infiniband/include/ib_verbs.h
+++ b/drivers/infiniband/include/ib_verbs.h