diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-06-25 05:46:44 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-25 10:00:54 -0700 |
| commit | 09a9a45dc62fef5f46a0dc98a3cefdb464cc4aaa (patch) | |
| tree | 6ed1877420d2af9a2ac71cbafe0c515fc257b409 /drivers/ieee1394 | |
| parent | fb1bb34d45400f12e0a33f8c487b3795674908a7 (diff) | |
| download | linux-09a9a45dc62fef5f46a0dc98a3cefdb464cc4aaa.tar.bz2 | |
[PATCH] ieee1394: nodemgr: do not peek into struct semaphore
Also revert patch "frv: ieee1394 is borken on frv", as it no longer is.
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Cc: David Howells <dhowells@redhat.com>
Cc: Jody McIntyre <scjody@modernduck.com>
Cc: Ben Collins <bcollins@ubuntu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/ieee1394/nodemgr.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig index 79b81be67975..186737539cf5 100644 --- a/drivers/ieee1394/Kconfig +++ b/drivers/ieee1394/Kconfig @@ -4,7 +4,7 @@ menu "IEEE 1394 (FireWire) support" config IEEE1394 tristate "IEEE 1394 (FireWire) support" - depends on (PCI || BROKEN) && (BROKEN || !FRV) + depends on PCI || BROKEN select NET help IEEE 1394 describes a high performance serial bus, which is also diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 948f1b8c4238..50c71e17de73 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c @@ -8,6 +8,7 @@ * directory of the kernel sources for details. */ +#include <linux/bitmap.h> #include <linux/kernel.h> #include <linux/config.h> #include <linux/list.h> @@ -334,10 +335,12 @@ static ssize_t fw_show_ne_bus_options(struct device *dev, struct device_attribut static DEVICE_ATTR(bus_options,S_IRUGO,fw_show_ne_bus_options,NULL); +/* tlabels_free, tlabels_allocations, tlabels_mask are read non-atomically + * here, therefore displayed values may be occasionally wrong. */ static ssize_t fw_show_ne_tlabels_free(struct device *dev, struct device_attribute *attr, char *buf) { struct node_entry *ne = container_of(dev, struct node_entry, device); - return sprintf(buf, "%d\n", atomic_read(&ne->tpool->count.count) + 1); + return sprintf(buf, "%d\n", 64 - bitmap_weight(ne->tpool->pool, 64)); } static DEVICE_ATTR(tlabels_free,S_IRUGO,fw_show_ne_tlabels_free,NULL); |