[PATCH] IB uverbs: hook up Kconfig/Makefile

Hook up InfiniBand userspace verbs to Kconfig and the make system.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig
index 3cc3ff0cccb194b277eed00f7c13745f8f8cc323..79c8e2dd9c33cfdc0618b228067c0c1261140cb7 100644 (file)
--- a/drivers/infiniband/Kconfig
+++ b/drivers/infiniband/Kconfig
@@ -7,6 +7,16 @@ config INFINIBAND
          any protocols you wish to use as well as drivers for your
          InfiniBand hardware.
 
+config INFINIBAND_USER_VERBS
+       tristate "InfiniBand userspace verbs support"
+       depends on INFINIBAND
+       ---help---
+         Userspace InfiniBand verbs support.  This is the kernel side
+         of userspace verbs, which allows userspace processes to
+         directly access InfiniBand hardware for fast-path
+         operations.  You will also need libibverbs and a hardware
+         driver library from <http://www.openib.org>.
+
 source "drivers/infiniband/hw/mthca/Kconfig"
 
 source "drivers/infiniband/ulp/ipoib/Kconfig"

diff --git a/drivers/infiniband/core/Makefile b/drivers/infiniband/core/Makefile
index d2dbfb52c0a3169c287475199f4a681a3f06ca13..e1a7cf3e86368982f68f2f224d01f4142fc92164 100644 (file)
--- a/drivers/infiniband/core/Makefile
+++ b/drivers/infiniband/core/Makefile
@@ -1,6 +1,7 @@
 EXTRA_CFLAGS += -Idrivers/infiniband/include
 
-obj-$(CONFIG_INFINIBAND) +=    ib_core.o ib_mad.o ib_sa.o ib_umad.o
+obj-$(CONFIG_INFINIBAND) +=            ib_core.o ib_mad.o ib_sa.o ib_umad.o
+obj-$(CONFIG_INFINIBAND_USER_VERBS) += ib_uverbs.o
 
 ib_core-y :=                   packer.o ud_header.o verbs.o sysfs.o \
                                device.o fmr_pool.o cache.o
@@ -10,3 +11,5 @@ ib_mad-y :=                   mad.o smi.o agent.o
 ib_sa-y :=                     sa_query.o
 
 ib_umad-y :=                   user_mad.o
+
+ib_uverbs-y :=                 uverbs_main.o uverbs_cmd.o uverbs_mem.o