Commit a4d61e84 authored by Roland Dreier's avatar Roland Dreier Committed by Roland Dreier

[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: default avatarRoland Dreier <rolandd@cisco.com>
parent 1ad62a19
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
......
......@@ -41,7 +41,7 @@
#include <asm/bug.h>
#include <ib_smi.h>
#include <rdma/ib_smi.h>
#include "smi.h"
#include "agent_priv.h"
......
......@@ -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"
......
......@@ -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");
......
......@@ -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
......
......@@ -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);
......
......@@ -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"
......
......@@ -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: "
......
......@@ -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)
{
......
......@@ -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");
......
......@@ -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"
/*
......
......@@ -36,7 +36,7 @@
#include "core_priv.h"
#include <ib_mad.h>
#include <rdma/ib_mad.h>
struct ib_port {
struct kobject kobj;
......
......@@ -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
......
......@@ -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), \
......
......@@ -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");
......
......@@ -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;
......
......@@ -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 */
......
EXTRA_CFLAGS += -Idrivers/infiniband/include
ifdef CONFIG_INFINIBAND_MTHCA_DEBUG
EXTRA_CFLAGS += -DDEBUG
endif
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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"
......
......@@ -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"
......
......@@ -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"
......
......@@ -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)
......
......@@ -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"
......
EXTRA_CFLAGS += -Idrivers/infiniband/include
obj-$(CONFIG_INFINIBAND_IPOIB) += ib_ipoib.o
ib_ipoib-y := ipoib_main.o \
......
......@@ -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 */
......
......@@ -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"
......
......@@ -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"
......
......@@ -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
......
......@@ -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,
......
......@@ -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;
......
......@@ -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
......
......@@ -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,
......
......@@ -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 */
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment