diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-23 21:34:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-23 21:34:43 -0700 |
| commit | de80af4cc9c30318224b8520dc76a7d097e64cbd (patch) | |
| tree | 0bc587a0b5433e41cd1e7feefa2359561fe71fbd /kernel | |
| parent | 405d2965597fd9dbd822a5a8c1c66c925a942d6e (diff) | |
| parent | 5f1835da79df8607ecbd69f648b5b140b7a0b8ba (diff) | |
| download | linux-de80af4cc9c30318224b8520dc76a7d097e64cbd.tar.gz linux-de80af4cc9c30318224b8520dc76a7d097e64cbd.tar.bz2 linux-de80af4cc9c30318224b8520dc76a7d097e64cbd.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6:
sysfs: don't warn on removal of a nonexistent binary file
HOWTO: latest lxr url address changed
HOWTO: korean translation of Documentation/HOWTO
Fix Off-by-one in /sys/module/*/refcnt
sysfs: fix locking in sysfs_lookup() and sysfs_rename_dir()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/module.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/module.c b/kernel/module.c index 33c04ad51175..db0ead0363e2 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -784,8 +784,7 @@ EXPORT_SYMBOL_GPL(symbol_put_addr); static ssize_t show_refcnt(struct module_attribute *mattr, struct module *mod, char *buffer) { - /* sysfs holds a reference */ - return sprintf(buffer, "%u\n", module_refcount(mod)-1); + return sprintf(buffer, "%u\n", module_refcount(mod)); } static struct module_attribute refcnt = { |