From: Daniel Mack <[email protected]>

This patch hooks up the build system to actually compile the files
added by previous patches. It also adds an entry to MAINTAINERS to
direct people to Greg KH, David Herrmann, Djalal Harouni and me for
questions and patches.

Signed-off-by: Daniel Mack <[email protected]>
Signed-off-by: David Herrmann <[email protected]>
Signed-off-by: Djalal Harouni <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
 MAINTAINERS        | 12 ++++++++++++
 init/Kconfig       | 12 ++++++++++++
 ipc/Makefile       |  2 +-
 ipc/kdbus/Makefile | 21 +++++++++++++++++++++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 ipc/kdbus/Makefile

diff --git a/MAINTAINERS b/MAINTAINERS
index c444907ccd69..cfb1819667bc 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5276,6 +5276,18 @@ S:       Maintained
 F:     Documentation/kbuild/kconfig-language.txt
 F:     scripts/kconfig/
 
+KDBUS
+M:     Greg Kroah-Hartman <[email protected]>
+M:     Daniel Mack <[email protected]>
+M:     David Herrmann <[email protected]>
+M:     Djalal Harouni <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     ipc/kdbus/*
+F:     Documentation/kdbus.txt
+F:     include/uapi/linux/kdbus.h
+F:     tools/testing/selftests/kdbus/
+
 KDUMP
 M:     Vivek Goyal <[email protected]>
 M:     Haren Myneni <[email protected]>
diff --git a/init/Kconfig b/init/Kconfig
index 2081a4d3d917..44bf491c971f 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -261,6 +261,18 @@ config POSIX_MQUEUE_SYSCTL
        depends on SYSCTL
        default y
 
+config KDBUS
+       tristate "kdbus interprocess communication"
+       depends on TMPFS
+       help
+         D-Bus is a system for low-latency, low-overhead, easy to use
+         interprocess communication (IPC).
+
+         See Documentation/kdbus.txt
+
+         To compile this driver as a module, choose M here: the
+         module will be called kdbus.
+
 config CROSS_MEMORY_ATTACH
        bool "Enable process_vm_readv/writev syscalls"
        depends on MMU
diff --git a/ipc/Makefile b/ipc/Makefile
index 9075e172e52c..df8df7c4e33c 100644
--- a/ipc/Makefile
+++ b/ipc/Makefile
@@ -9,4 +9,4 @@ obj_mq-$(CONFIG_COMPAT) += compat_mq.o
 obj-$(CONFIG_POSIX_MQUEUE) += mqueue.o msgutil.o $(obj_mq-y)
 obj-$(CONFIG_IPC_NS) += namespace.o
 obj-$(CONFIG_POSIX_MQUEUE_SYSCTL) += mq_sysctl.o
-
+obj-$(CONFIG_KDBUS) += kdbus/
diff --git a/ipc/kdbus/Makefile b/ipc/kdbus/Makefile
new file mode 100644
index 000000000000..37e5dd4f218a
--- /dev/null
+++ b/ipc/kdbus/Makefile
@@ -0,0 +1,21 @@
+kdbus-y := \
+       bus.o \
+       connection.o \
+       endpoint.o \
+       fs.o \
+       handle.o \
+       item.o \
+       main.o \
+       match.o \
+       message.o \
+       metadata.o \
+       names.o \
+       node.o \
+       notify.o \
+       domain.o \
+       policy.o \
+       pool.o \
+       queue.o \
+       util.o
+
+obj-$(CONFIG_KDBUS) += kdbus.o
-- 
2.1.3

--
To unsubscribe from this list: send the line "unsubscribe linux-api" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to