tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

authored by

Roland Dreier and committed by
Roland Dreier a4d61e84 1ad62a19

+51 -57
unified split
-2
drivers/infiniband/core/Makefile
··· 1 - EXTRA_CFLAGS += -Idrivers/infiniband/include 2 - 3 1 obj-$(CONFIG_INFINIBAND) += ib_core.o ib_mad.o ib_sa.o \ 4 2 ib_cm.o ib_umad.o ib_ucm.o 5 3 obj-$(CONFIG_INFINIBAND_USER_VERBS) += ib_uverbs.o
+1 -1
drivers/infiniband/core/agent.c
··· 41 41 42 42 #include <asm/bug.h> 43 43 44 - #include <ib_smi.h> 44 + #include <rdma/ib_smi.h> 45 45 46 46 #include "smi.h" 47 47 #include "agent_priv.h"
+1 -1
drivers/infiniband/core/cache.c
··· 39 39 #include <linux/errno.h> 40 40 #include <linux/slab.h> 41 41 42 - #include <ib_cache.h> 42 + #include <rdma/ib_cache.h> 43 43 44 44 #include "core_priv.h" 45 45
+2 -2
drivers/infiniband/core/cm.c
··· 43 43 #include <linux/spinlock.h> 44 44 #include <linux/workqueue.h> 45 45 46 - #include <ib_cache.h> 47 - #include <ib_cm.h> 46 + #include <rdma/ib_cache.h> 47 + #include <rdma/ib_cm.h> 48 48 #include "cm_msgs.h" 49 49 50 50 MODULE_AUTHOR("Sean Hefty");
+1 -1
drivers/infiniband/core/cm_msgs.h
··· 34 34 #if !defined(CM_MSGS_H) 35 35 #define CM_MSGS_H 36 36 37 - #include <ib_mad.h> 37 + #include <rdma/ib_mad.h> 38 38 39 39 /* 40 40 * Parameters to routines below should be in network-byte order, and values
+1 -1
drivers/infiniband/core/core_priv.h
··· 38 38 #include <linux/list.h> 39 39 #include <linux/spinlock.h> 40 40 41 - #include <ib_verbs.h> 41 + #include <rdma/ib_verbs.h> 42 42 43 43 int ib_device_register_sysfs(struct ib_device *device); 44 44 void ib_device_unregister_sysfs(struct ib_device *device);
+1 -1
drivers/infiniband/core/fmr_pool.c
··· 39 39 #include <linux/jhash.h> 40 40 #include <linux/kthread.h> 41 41 42 - #include <ib_fmr_pool.h> 42 + #include <rdma/ib_fmr_pool.h> 43 43 44 44 #include "core_priv.h" 45 45
+2 -2
drivers/infiniband/core/mad_priv.h
··· 40 40 #include <linux/pci.h> 41 41 #include <linux/kthread.h> 42 42 #include <linux/workqueue.h> 43 - #include <ib_mad.h> 44 - #include <ib_smi.h> 43 + #include <rdma/ib_mad.h> 44 + #include <rdma/ib_smi.h> 45 45 46 46 47 47 #define PFX "ib_mad: "
+1 -1
drivers/infiniband/core/packer.c
··· 33 33 * $Id: packer.c 1349 2004-12-16 21:09:43Z roland $ 34 34 */ 35 35 36 - #include <ib_pack.h> 36 + #include <rdma/ib_pack.h> 37 37 38 38 static u64 value_read(int offset, int size, void *structure) 39 39 {
+2 -2
drivers/infiniband/core/sa_query.c
··· 44 44 #include <linux/kref.h> 45 45 #include <linux/idr.h> 46 46 47 - #include <ib_pack.h> 48 - #include <ib_sa.h> 47 + #include <rdma/ib_pack.h> 48 + #include <rdma/ib_sa.h> 49 49 50 50 MODULE_AUTHOR("Roland Dreier"); 51 51 MODULE_DESCRIPTION("InfiniBand subnet administration query support");
+1 -1
drivers/infiniband/core/smi.c
··· 37 37 * $Id: smi.c 1389 2004-12-27 22:56:47Z roland $ 38 38 */ 39 39 40 - #include <ib_smi.h> 40 + #include <rdma/ib_smi.h> 41 41 #include "smi.h" 42 42 43 43 /*
+1 -1
drivers/infiniband/core/sysfs.c
··· 36 36 37 37 #include "core_priv.h" 38 38 39 - #include <ib_mad.h> 39 + #include <rdma/ib_mad.h> 40 40 41 41 struct ib_port { 42 42 struct kobject kobj;
+2 -2
drivers/infiniband/core/ucm.h
··· 40 40 #include <linux/cdev.h> 41 41 #include <linux/idr.h> 42 42 43 - #include <ib_cm.h> 44 - #include <ib_user_cm.h> 43 + #include <rdma/ib_cm.h> 44 + #include <rdma/ib_user_cm.h> 45 45 46 46 #define IB_UCM_CM_ID_INVALID 0xffffffff 47 47
+1 -1
drivers/infiniband/core/ud_header.c
··· 35 35 36 36 #include <linux/errno.h> 37 37 38 - #include <ib_pack.h> 38 + #include <rdma/ib_pack.h> 39 39 40 40 #define STRUCT_FIELD(header, field) \ 41 41 .struct_offset_bytes = offsetof(struct ib_unpacked_ ## header, field), \
+2 -2
drivers/infiniband/core/user_mad.c
··· 49 49 #include <asm/uaccess.h> 50 50 #include <asm/semaphore.h> 51 51 52 - #include <ib_mad.h> 53 - #include <ib_user_mad.h> 52 + #include <rdma/ib_mad.h> 53 + #include <rdma/ib_user_mad.h> 54 54 55 55 MODULE_AUTHOR("Roland Dreier"); 56 56 MODULE_DESCRIPTION("InfiniBand userspace MAD packet access");
+2 -2
drivers/infiniband/core/uverbs.h
··· 45 45 #include <linux/kref.h> 46 46 #include <linux/idr.h> 47 47 48 - #include <ib_verbs.h> 49 - #include <ib_user_verbs.h> 48 + #include <rdma/ib_verbs.h> 49 + #include <rdma/ib_user_verbs.h> 50 50 51 51 struct ib_uverbs_device { 52 52 int devnum;
+2 -2
drivers/infiniband/core/verbs.c
··· 41 41 #include <linux/errno.h> 42 42 #include <linux/err.h> 43 43 44 - #include <ib_verbs.h> 45 - #include <ib_cache.h> 44 + #include <rdma/ib_verbs.h> 45 + #include <rdma/ib_cache.h> 46 46 47 47 /* Protection domains */ 48 48
-2
drivers/infiniband/hw/mthca/Makefile
··· 1 - EXTRA_CFLAGS += -Idrivers/infiniband/include 2 - 3 1 ifdef CONFIG_INFINIBAND_MTHCA_DEBUG 4 2 EXTRA_CFLAGS += -DDEBUG 5 3 endif
+2 -2
drivers/infiniband/hw/mthca/mthca_av.c
··· 35 35 36 36 #include <linux/init.h> 37 37 38 - #include <ib_verbs.h> 39 - #include <ib_cache.h> 38 + #include <rdma/ib_verbs.h> 39 + #include <rdma/ib_cache.h> 40 40 41 41 #include "mthca_dev.h" 42 42
+1 -1
drivers/infiniband/hw/mthca/mthca_cmd.c
··· 37 37 #include <linux/pci.h> 38 38 #include <linux/errno.h> 39 39 #include <asm/io.h> 40 - #include <ib_mad.h> 40 + #include <rdma/ib_mad.h> 41 41 42 42 #include "mthca_dev.h" 43 43 #include "mthca_config_reg.h"
+1 -1
drivers/infiniband/hw/mthca/mthca_cmd.h
··· 36 36 #ifndef MTHCA_CMD_H 37 37 #define MTHCA_CMD_H 38 38 39 - #include <ib_verbs.h> 39 + #include <rdma/ib_verbs.h> 40 40 41 41 #define MTHCA_MAILBOX_SIZE 4096 42 42
+1 -1
drivers/infiniband/hw/mthca/mthca_cq.c
··· 39 39 #include <linux/init.h> 40 40 #include <linux/hardirq.h> 41 41 42 - #include <ib_pack.h> 42 + #include <rdma/ib_pack.h> 43 43 44 44 #include "mthca_dev.h" 45 45 #include "mthca_cmd.h"
+3 -3
drivers/infiniband/hw/mthca/mthca_mad.c
··· 34 34 * $Id: mthca_mad.c 1349 2004-12-16 21:09:43Z roland $ 35 35 */ 36 36 37 - #include <ib_verbs.h> 38 - #include <ib_mad.h> 39 - #include <ib_smi.h> 37 + #include <rdma/ib_verbs.h> 38 + #include <rdma/ib_mad.h> 39 + #include <rdma/ib_smi.h> 40 40 41 41 #include "mthca_dev.h" 42 42 #include "mthca_cmd.h"
+1 -1
drivers/infiniband/hw/mthca/mthca_provider.c
··· 36 36 * $Id: mthca_provider.c 1397 2004-12-28 05:09:00Z roland $ 37 37 */ 38 38 39 - #include <ib_smi.h> 39 + #include <rdma/ib_smi.h> 40 40 #include <linux/mm.h> 41 41 42 42 #include "mthca_dev.h"
+2 -2
drivers/infiniband/hw/mthca/mthca_provider.h
··· 37 37 #ifndef MTHCA_PROVIDER_H 38 38 #define MTHCA_PROVIDER_H 39 39 40 - #include <ib_verbs.h> 41 - #include <ib_pack.h> 40 + #include <rdma/ib_verbs.h> 41 + #include <rdma/ib_pack.h> 42 42 43 43 #define MTHCA_MPT_FLAG_ATOMIC (1 << 14) 44 44 #define MTHCA_MPT_FLAG_REMOTE_WRITE (1 << 13)
+3 -3
drivers/infiniband/hw/mthca/mthca_qp.c
··· 37 37 38 38 #include <linux/init.h> 39 39 40 - #include <ib_verbs.h> 41 - #include <ib_cache.h> 42 - #include <ib_pack.h> 40 + #include <rdma/ib_verbs.h> 41 + #include <rdma/ib_cache.h> 42 + #include <rdma/ib_pack.h> 43 43 44 44 #include "mthca_dev.h" 45 45 #include "mthca_cmd.h"
+1 -1
drivers/infiniband/include/ib_cache.h include/rdma/ib_cache.h
··· 37 37 #ifndef _IB_CACHE_H 38 38 #define _IB_CACHE_H 39 39 40 - #include <ib_verbs.h> 40 + #include <rdma/ib_verbs.h> 41 41 42 42 /** 43 43 * ib_get_cached_gid - Returns a cached GID table entry
+2 -2
drivers/infiniband/include/ib_cm.h include/rdma/ib_cm.h
··· 37 37 #if !defined(IB_CM_H) 38 38 #define IB_CM_H 39 39 40 - #include <ib_mad.h> 41 - #include <ib_sa.h> 40 + #include <rdma/ib_mad.h> 41 + #include <rdma/ib_sa.h> 42 42 43 43 enum ib_cm_state { 44 44 IB_CM_IDLE,
+1 -1
drivers/infiniband/include/ib_fmr_pool.h include/rdma/ib_fmr_pool.h
··· 36 36 #if !defined(IB_FMR_POOL_H) 37 37 #define IB_FMR_POOL_H 38 38 39 - #include <ib_verbs.h> 39 + #include <rdma/ib_verbs.h> 40 40 41 41 struct ib_fmr_pool; 42 42
+1 -1
drivers/infiniband/include/ib_mad.h include/rdma/ib_mad.h
··· 41 41 42 42 #include <linux/pci.h> 43 43 44 - #include <ib_verbs.h> 44 + #include <rdma/ib_verbs.h> 45 45 46 46 /* Management base version */ 47 47 #define IB_MGMT_BASE_VERSION 1
+1 -1
drivers/infiniband/include/ib_pack.h include/rdma/ib_pack.h
··· 35 35 #ifndef IB_PACK_H 36 36 #define IB_PACK_H 37 37 38 - #include <ib_verbs.h> 38 + #include <rdma/ib_verbs.h> 39 39 40 40 enum { 41 41 IB_LRH_BYTES = 8,
+2 -2
drivers/infiniband/include/ib_sa.h include/rdma/ib_sa.h
··· 38 38 39 39 #include <linux/compiler.h> 40 40 41 - #include <ib_verbs.h> 42 - #include <ib_mad.h> 41 + #include <rdma/ib_verbs.h> 42 + #include <rdma/ib_mad.h> 43 43 44 44 enum { 45 45 IB_SA_CLASS_VERSION = 2, /* IB spec version 1.1/1.2 */
+1 -1
drivers/infiniband/include/ib_smi.h include/rdma/ib_smi.h
··· 39 39 #if !defined( IB_SMI_H ) 40 40 #define IB_SMI_H 41 41 42 - #include <ib_mad.h> 42 + #include <rdma/ib_mad.h> 43 43 44 44 #define IB_SMP_DATA_SIZE 64 45 45 #define IB_SMP_MAX_PATH_HOPS 64
drivers/infiniband/include/ib_user_cm.h include/rdma/ib_user_cm.h
drivers/infiniband/include/ib_user_mad.h include/rdma/ib_user_mad.h
drivers/infiniband/include/ib_user_verbs.h include/rdma/ib_user_verbs.h
drivers/infiniband/include/ib_verbs.h include/rdma/ib_verbs.h
-2
drivers/infiniband/ulp/ipoib/Makefile
··· 1 - EXTRA_CFLAGS += -Idrivers/infiniband/include 2 - 3 1 obj-$(CONFIG_INFINIBAND_IPOIB) += ib_ipoib.o 4 2 5 3 ib_ipoib-y := ipoib_main.o \
+3 -3
drivers/infiniband/ulp/ipoib/ipoib.h
··· 51 51 #include <asm/atomic.h> 52 52 #include <asm/semaphore.h> 53 53 54 - #include <ib_verbs.h> 55 - #include <ib_pack.h> 56 - #include <ib_sa.h> 54 + #include <rdma/ib_verbs.h> 55 + #include <rdma/ib_pack.h> 56 + #include <rdma/ib_sa.h> 57 57 58 58 /* constants */ 59 59
+1 -1
drivers/infiniband/ulp/ipoib/ipoib_ib.c
··· 38 38 #include <linux/delay.h> 39 39 #include <linux/dma-mapping.h> 40 40 41 - #include <ib_cache.h> 41 + #include <rdma/ib_cache.h> 42 42 43 43 #include "ipoib.h" 44 44
+1 -1
drivers/infiniband/ulp/ipoib/ipoib_verbs.c
··· 33 33 * $Id: ipoib_verbs.c 1349 2004-12-16 21:09:43Z roland $ 34 34 */ 35 35 36 - #include <ib_cache.h> 36 + #include <rdma/ib_cache.h> 37 37 38 38 #include "ipoib.h" 39 39