diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile index 10be36731ed7baef2cfc30abb3aa57f036fc6c02..678a7e097f329de2e3e6b926443807babf2ccdf4 100644 --- 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 diff --git a/drivers/infiniband/core/agent.c b/drivers/infiniband/core/agent.c index 3d36feb8c5ba5e7bc51eaba467cfd5b7ead88355..5ac86f566dc020004f28f73bacf4934998a9fd30 100644 --- a/drivers/infiniband/core/agent.c +++ b/drivers/infiniband/core/agent.c @@ -41,7 +41,7 @@ #include -#include +#include #include "smi.h" #include "agent_priv.h" diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c index 9376e53f50f20d9bc81edec219d7a745867eadfe..f014e639088ca13d923df980234b998244062983 100644 --- a/drivers/infiniband/core/cache.c +++ b/drivers/infiniband/core/cache.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include "core_priv.h" diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 781be773a1865d7f6a1159dc5187c702c044c4fd..4de93ba274a61202e7e9d29d494826a148c79ac2 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c @@ -43,8 +43,8 @@ #include #include -#include -#include +#include +#include #include "cm_msgs.h" MODULE_AUTHOR("Sean Hefty"); diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h index 807a9fbb38f5993441758d1134d652414d4fb390..813ab70bf6d5ebd5642bde4d499ce0cb911f81be 100644 --- 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 +#include /* * Parameters to routines below should be in network-byte order, and values diff --git a/drivers/infiniband/core/core_priv.h b/drivers/infiniband/core/core_priv.h index 797049626ff67b49fa7e678b44f0f98018223de8..7ad47a4b166b2bfbd35e5f8359b80827637c8e80 100644 --- a/drivers/infiniband/core/core_priv.h +++ b/drivers/infiniband/core/core_priv.h @@ -38,7 +38,7 @@ #include #include -#include +#include int ib_device_register_sysfs(struct ib_device *device); void ib_device_unregister_sysfs(struct ib_device *device); diff --git a/drivers/infiniband/core/fmr_pool.c b/drivers/infiniband/core/fmr_pool.c index 1f7374927f380bcfe980ba99ab638088348e70d0..d34a6f1c4f4c53a48c2d6ea401ccf5bfcdfa61e0 100644 --- a/drivers/infiniband/core/fmr_pool.c +++ b/drivers/infiniband/core/fmr_pool.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include "core_priv.h" diff --git a/drivers/infiniband/core/mad_priv.h b/drivers/infiniband/core/mad_priv.h index 807b0f3663532c4f7032ed32d9b6eee4d504daef..f1ba794e0daa62a3dea35bfc7d2b0f232449af7e 100644 --- a/drivers/infiniband/core/mad_priv.h +++ b/drivers/infiniband/core/mad_priv.h @@ -40,8 +40,8 @@ #include #include #include -#include -#include +#include +#include #define PFX "ib_mad: " diff --git a/drivers/infiniband/core/packer.c b/drivers/infiniband/core/packer.c index ed1684b09f928f2a955cdae1459ef89efa86028a..35df5010e723ecf9d466f0a27fd33f51bfe80e86 100644 --- 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 +#include static u64 value_read(int offset, int size, void *structure) { diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c index b03bed2ed87ad64efe24350425c55030873521bd..126ac80db7b84f3e71b83211188b8b8024e07912 100644 --- a/drivers/infiniband/core/sa_query.c +++ b/drivers/infiniband/core/sa_query.c @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include MODULE_AUTHOR("Roland Dreier"); MODULE_DESCRIPTION("InfiniBand subnet administration query support"); diff --git a/drivers/infiniband/core/smi.c b/drivers/infiniband/core/smi.c index 1c0d733c3fcebce791d75f1dbea8ccce653b234d..35852e794e26533aa61c8c8fe3900c3b5d372eee 100644 --- 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 +#include #include "smi.h" /* diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c index bf7334e7fac6ba52e06a72e94d03c6698e19198b..fae1c2dcee51660650921523ae85e1c5748b26fe 100644 --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c @@ -36,7 +36,7 @@ #include "core_priv.h" -#include +#include struct ib_port { struct kobject kobj; diff --git a/drivers/infiniband/core/ucm.h b/drivers/infiniband/core/ucm.h index 039e8a3783c0242d4e243bdfc8f1616ea230e427..c8819b928a1ba82772d0ae48761ee41e7ebc6f4d 100644 --- a/drivers/infiniband/core/ucm.h +++ b/drivers/infiniband/core/ucm.h @@ -40,8 +40,8 @@ #include #include -#include -#include +#include +#include #define IB_UCM_CM_ID_INVALID 0xffffffff diff --git a/drivers/infiniband/core/ud_header.c b/drivers/infiniband/core/ud_header.c index 89cd76d7c5a54e79da264a1c28882f896c689046..527b23450ab3d72dc12e3298e8bbdc49a871e12b 100644 --- a/drivers/infiniband/core/ud_header.c +++ b/drivers/infiniband/core/ud_header.c @@ -35,7 +35,7 @@ #include -#include +#include #define STRUCT_FIELD(header, field) \ .struct_offset_bytes = offsetof(struct ib_unpacked_ ## header, field), \ diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 16d91f187758ac8d2a358d6d611eb9cfedbc72c8..7c2f03057ddb1f6ed411d3509c68ba768e4bf0ad 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c @@ -49,8 +49,8 @@ #include #include -#include -#include +#include +#include MODULE_AUTHOR("Roland Dreier"); MODULE_DESCRIPTION("InfiniBand userspace MAD packet access"); diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h index db161810c0c0159f98c107db8b9f1f960c415703..180b3d4765e40bc4eae9d3c0c6516006fefdbee2 100644 --- a/drivers/infiniband/core/uverbs.h +++ b/drivers/infiniband/core/uverbs.h @@ -45,8 +45,8 @@ #include #include -#include -#include +#include +#include struct ib_uverbs_device { int devnum; diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index c035510c5a36ea75f27cdc3764927dd4dbf1bc54..5081d903e5617d00e602da1a89731a555984598a 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c @@ -41,8 +41,8 @@ #include #include -#include -#include +#include +#include /* Protection domains */ diff --git a/drivers/infiniband/hw/mthca/Makefile b/drivers/infiniband/hw/mthca/Makefile index 1eb87408e069e2e824536b4f059ebe0a40cfa2a8..c44f7bae5424fd8227430918ecfd264522569cd0 100644 --- 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 diff --git a/drivers/infiniband/hw/mthca/mthca_av.c b/drivers/infiniband/hw/mthca/mthca_av.c index e596210f11b32856da21d04446810e3b54dc9078..889e85096736c198ef2cbc6a6525cfafcd06c7ea 100644 --- a/drivers/infiniband/hw/mthca/mthca_av.c +++ b/drivers/infiniband/hw/mthca/mthca_av.c @@ -35,8 +35,8 @@ #include -#include -#include +#include +#include #include "mthca_dev.h" diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c index 60e4b213635af30091b05115a97866e073881259..cc758a2d2bc6cad452f73b644ada7246ea2441bc 100644 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include "mthca_dev.h" #include "mthca_config_reg.h" diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.h b/drivers/infiniband/hw/mthca/mthca_cmd.h index ef2a765d69539771a2ec10218403d5d5ac844ba9..65f976a13e02065469c99001d41d2a09201853e7 100644 --- 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 +#include #define MTHCA_MAILBOX_SIZE 4096 diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c index 5ece609c2ee0398678c66a3968ad399cfcdefe83..8600b6c3e0c262c72c45a8a281091238012619d8 100644 --- a/drivers/infiniband/hw/mthca/mthca_cq.c +++ b/drivers/infiniband/hw/mthca/mthca_cq.c @@ -39,7 +39,7 @@ #include #include -#include +#include #include "mthca_dev.h" #include "mthca_cmd.h" diff --git a/drivers/infiniband/hw/mthca/mthca_mad.c b/drivers/infiniband/hw/mthca/mthca_mad.c index 64fa78722cf6010b7a9ce377f2b2ce9db53567a9..9804174f7f3c5b9594f337c4dcdf16a4554deef5 100644 --- 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 -#include -#include +#include +#include +#include #include "mthca_dev.h" #include "mthca_cmd.h" diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c index 23ceb26af8fe5189fc82c4a4c423b98bc4a4913f..1c1c2e230871202fe4b57bcf26aa602e6b505586 100644 --- 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 +#include #include #include "mthca_dev.h" diff --git a/drivers/infiniband/hw/mthca/mthca_provider.h b/drivers/infiniband/hw/mthca/mthca_provider.h index 024015678c8a6ff1590b857c18f167187a584330..bcd4b01a339cb1f7abae1d82f582b754df0cb4bc 100644 --- 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 -#include +#include +#include #define MTHCA_MPT_FLAG_ATOMIC (1 << 14) #define MTHCA_MPT_FLAG_REMOTE_WRITE (1 << 13) diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c index 7607b980073628debc86979b53c807c60cbc1c5d..0164b84d4ec643062892122cf6ebf567d92ec5f1 100644 --- a/drivers/infiniband/hw/mthca/mthca_qp.c +++ b/drivers/infiniband/hw/mthca/mthca_qp.c @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include +#include +#include #include "mthca_dev.h" #include "mthca_cmd.h" diff --git a/drivers/infiniband/ulp/ipoib/Makefile b/drivers/infiniband/ulp/ipoib/Makefile index 394bc08abc6fc318677f049bd3d0fc639931a69f..8935e74ae3f8e9608ced0be86d2e3818db268dd8 100644 --- 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 \ diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index e23041c7be8f678c78529c694ef8ad79d3d31301..bea960b8191feffff376dd7b64a26c2d9586d6f6 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h @@ -51,9 +51,9 @@ #include #include -#include -#include -#include +#include +#include +#include /* constants */ diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c index cb4f8062677cfd2019a0d6b8e3395e87c7882de4..ef0e3894863c023c08082c4c201da070fb393871 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c @@ -38,7 +38,7 @@ #include #include -#include +#include #include "ipoib.h" diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c index 21b58aa76feee48e42151c1542c53714f15c5972..79f59d0563edc04b04a1e9d211ce6f6bbfa4c538 100644 --- 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 +#include #include "ipoib.h" diff --git a/drivers/infiniband/include/ib_cache.h b/include/rdma/ib_cache.h similarity index 99% rename from drivers/infiniband/include/ib_cache.h rename to include/rdma/ib_cache.h index fff031bc95df22fb923c5a96a0bd74b01d8a17d8..5bf9834f7dcae588f126a8800f6685654e1bb881 100644 --- a/drivers/infiniband/include/ib_cache.h +++ b/include/rdma/ib_cache.h @@ -37,7 +37,7 @@ #ifndef _IB_CACHE_H #define _IB_CACHE_H -#include +#include /** * ib_get_cached_gid - Returns a cached GID table entry diff --git a/drivers/infiniband/include/ib_cm.h b/include/rdma/ib_cm.h similarity index 99% rename from drivers/infiniband/include/ib_cm.h rename to include/rdma/ib_cm.h index 8202ad2e643593dfc8b9a09cbb3032f9a0099e78..77fe9039209b1612590fcf7923fc1faaf8b1c8a7 100644 --- a/drivers/infiniband/include/ib_cm.h +++ b/include/rdma/ib_cm.h @@ -37,8 +37,8 @@ #if !defined(IB_CM_H) #define IB_CM_H -#include -#include +#include +#include enum ib_cm_state { IB_CM_IDLE, diff --git a/drivers/infiniband/include/ib_fmr_pool.h b/include/rdma/ib_fmr_pool.h similarity index 99% rename from drivers/infiniband/include/ib_fmr_pool.h rename to include/rdma/ib_fmr_pool.h index 6c9e24d6e1448968e583577ede6972f982a2f46e..86b7e93f198b429959c70dbf20d5782bb24a351a 100644 --- a/drivers/infiniband/include/ib_fmr_pool.h +++ b/include/rdma/ib_fmr_pool.h @@ -36,7 +36,7 @@ #if !defined(IB_FMR_POOL_H) #define IB_FMR_POOL_H -#include +#include struct ib_fmr_pool; diff --git a/drivers/infiniband/include/ib_mad.h b/include/rdma/ib_mad.h similarity index 99% rename from drivers/infiniband/include/ib_mad.h rename to include/rdma/ib_mad.h index 9fcf6fc090356e78f253fa856124db5871405b2a..fc6b1c18ffc698fae47992646c2abed213a9ac3a 100644 --- a/drivers/infiniband/include/ib_mad.h +++ b/include/rdma/ib_mad.h @@ -41,7 +41,7 @@ #include -#include +#include /* Management base version */ #define IB_MGMT_BASE_VERSION 1 diff --git a/drivers/infiniband/include/ib_pack.h b/include/rdma/ib_pack.h similarity index 99% rename from drivers/infiniband/include/ib_pack.h rename to include/rdma/ib_pack.h index fe480f3e8654d8afb1fee3d5a158e9860fc60f1b..f926020d63314dc2a5a43fd047ea4ef95d43bc36 100644 --- a/drivers/infiniband/include/ib_pack.h +++ b/include/rdma/ib_pack.h @@ -35,7 +35,7 @@ #ifndef IB_PACK_H #define IB_PACK_H -#include +#include enum { IB_LRH_BYTES = 8, diff --git a/drivers/infiniband/include/ib_sa.h b/include/rdma/ib_sa.h similarity index 99% rename from drivers/infiniband/include/ib_sa.h rename to include/rdma/ib_sa.h index 326159c04acac00de8def94f21e82438f60c557d..c022edfc49da013844509e4b4ff22368449cae9c 100644 --- a/drivers/infiniband/include/ib_sa.h +++ b/include/rdma/ib_sa.h @@ -38,8 +38,8 @@ #include -#include -#include +#include +#include enum { IB_SA_CLASS_VERSION = 2, /* IB spec version 1.1/1.2 */ diff --git a/drivers/infiniband/include/ib_smi.h b/include/rdma/ib_smi.h similarity index 99% rename from drivers/infiniband/include/ib_smi.h rename to include/rdma/ib_smi.h index c07b31cb9499643fc9608e3b55b138aaa360d90b..87f60737f69575e2b86426f3cbaa592638dca151 100644 --- a/drivers/infiniband/include/ib_smi.h +++ b/include/rdma/ib_smi.h @@ -39,7 +39,7 @@ #if !defined( IB_SMI_H ) #define IB_SMI_H -#include +#include #define IB_SMP_DATA_SIZE 64 #define IB_SMP_MAX_PATH_HOPS 64 diff --git a/drivers/infiniband/include/ib_user_cm.h b/include/rdma/ib_user_cm.h similarity index 100% rename from drivers/infiniband/include/ib_user_cm.h rename to include/rdma/ib_user_cm.h diff --git a/drivers/infiniband/include/ib_user_mad.h b/include/rdma/ib_user_mad.h similarity index 100% rename from drivers/infiniband/include/ib_user_mad.h rename to include/rdma/ib_user_mad.h diff --git a/drivers/infiniband/include/ib_user_verbs.h b/include/rdma/ib_user_verbs.h similarity index 100% rename from drivers/infiniband/include/ib_user_verbs.h rename to include/rdma/ib_user_verbs.h diff --git a/drivers/infiniband/include/ib_verbs.h b/include/rdma/ib_verbs.h similarity index 100% rename from drivers/infiniband/include/ib_verbs.h rename to include/rdma/ib_verbs.h