summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-05 00:39:43 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-05 00:39:43 +0200
commit9f3eea6a2fbf5a07625713dc35e5f8fb91adb12f (patch)
treee5358f8cee31ca38d82b97269e904cb8d0b546b1 /include
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff)
parenttty-ldisc: be more careful in 'put_ldisc' locking (diff)
downloadlinux-9f3eea6a2fbf5a07625713dc35e5f8fb91adb12f.tar.xz
linux-9f3eea6a2fbf5a07625713dc35e5f8fb91adb12f.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: tty-ldisc: be more careful in 'put_ldisc' locking tty-ldisc: turn ldisc user count into a proper refcount tty-ldisc: make refcount be atomic_t 'users' count
Diffstat (limited to 'include')
-rw-r--r--include/linux/tty_ldisc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/tty_ldisc.h b/include/linux/tty_ldisc.h
index 40f38d896777..0c4ee9b88f85 100644
--- a/include/linux/tty_ldisc.h
+++ b/include/linux/tty_ldisc.h
@@ -144,7 +144,7 @@ struct tty_ldisc_ops {
struct tty_ldisc {
struct tty_ldisc_ops *ops;
- int refcount;
+ atomic_t users;
};
#define TTY_LDISC_MAGIC 0x5403