The patch titled
dlm: build
has been removed from the -mm tree. Its filename is
dlm-build.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: David Teigland <teigland@xxxxxxxxxx>
Adds the dlm to the build system.
Signed-off-by: Dave Teigland <teigland@xxxxxxxxxx>
Signed-off-by: Patrick Caulfield <pcaulfie@xxxxxxxxxx>
Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
Cc: Steven Whitehouse <swhiteho@xxxxxxxxxx>
---
drivers/Kconfig | 2 ++
drivers/Makefile | 1 +
drivers/dlm/Kconfig | 29 +++++++++++++++++++++++++++++
drivers/dlm/Makefile | 23 +++++++++++++++++++++++
4 files changed, 55 insertions(+)
diff -puN /dev/null drivers/dlm/Kconfig
--- /dev/null 2003-09-15 06:40:47.000000000 -0700
+++ devel-akpm/drivers/dlm/Kconfig 2006-03-27 22:48:39.000000000 -0800
@@ -0,0 +1,29 @@
+menu "Distributed Lock Manager"
+ depends on INET && EXPERIMENTAL
+
+config DLM
+ tristate "Distributed Lock Manager (DLM)"
+ depends on SYSFS
+ depends on IPV6 || IPV6=n
+ select IP_SCTP
+ help
+ A general purpose distributed lock manager for kernel or userspace
+ applications.
+
+config DLM_DEVICE
+ tristate "DLM device for userspace access"
+ depends on DLM
+ help
+ This module creates a misc device through which the dlm lockspace
+ and locking functions become available to userspace applications
+ (usually through the libdlm library).
+
+config DLM_DEBUG
+ bool "DLM debugging"
+ depends on DLM
+ help
+ Under the debugfs mount point, the name of each lockspace will
+ appear as a file in the "dlm" directory. The output is the
+ list of resource and locks the local node knows about.
+
+endmenu
diff -puN /dev/null drivers/dlm/Makefile
--- /dev/null 2003-09-15 06:40:47.000000000 -0700
+++ devel-akpm/drivers/dlm/Makefile 2006-03-27 22:48:39.000000000 -0800
@@ -0,0 +1,23 @@
+obj-$(CONFIG_DLM) += dlm.o
+obj-$(CONFIG_DLM_DEVICE) += dlm_device.o
+
+dlm-y := ast.o \
+ config.o \
+ dir.o \
+ lock.o \
+ lockspace.o \
+ lowcomms.o \
+ main.o \
+ member.o \
+ member_sysfs.o \
+ memory.o \
+ midcomms.o \
+ node_ioctl.o \
+ rcom.o \
+ recover.o \
+ recoverd.o \
+ requestqueue.o \
+ util.o
+dlm-$(CONFIG_DLM_DEBUG) += debug_fs.o
+
+dlm_device-y := device.o
diff -puN drivers/Kconfig~dlm-build drivers/Kconfig
--- devel/drivers/Kconfig~dlm-build 2006-03-27 22:48:39.000000000 -0800
+++ devel-akpm/drivers/Kconfig 2006-03-27 22:48:39.000000000 -0800
@@ -74,4 +74,6 @@ source "drivers/edac/Kconfig"
source "drivers/rtc/Kconfig"
+source "drivers/dlm/Kconfig"
+
endmenu
diff -puN drivers/Makefile~dlm-build drivers/Makefile
--- devel/drivers/Makefile~dlm-build 2006-03-27 22:48:39.000000000 -0800
+++ devel-akpm/drivers/Makefile 2006-03-27 22:48:39.000000000 -0800
@@ -58,6 +58,7 @@ obj-$(CONFIG_RTC_LIB) += rtc/
obj-$(CONFIG_I2C) += i2c/
obj-$(CONFIG_W1) += w1/
obj-$(CONFIG_HWMON) += hwmon/
+obj-$(CONFIG_DLM) += dlm/
obj-$(CONFIG_PHONE) += telephony/
obj-$(CONFIG_MD) += md/
obj-$(CONFIG_BT) += bluetooth/
_
Patches currently in -mm which might be from teigland@xxxxxxxxxx are
git-gfs2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
