diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-04 18:39:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-04 18:39:43 -0400 |
| commit | 9f3eea6a2fbf5a07625713dc35e5f8fb91adb12f (patch) | |
| tree | e5358f8cee31ca38d82b97269e904cb8d0b546b1 /include | |
| parent | 2cf812d732442e86c1e2018e23ad82f9bc594a38 (diff) | |
| parent | cbe9352fa08f90aa03b4dbf1bbabfc95d196e562 (diff) | |
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.h | 2 |
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 { | |||
| 144 | 144 | ||
| 145 | struct tty_ldisc { | 145 | struct tty_ldisc { |
| 146 | struct tty_ldisc_ops *ops; | 146 | struct tty_ldisc_ops *ops; |
| 147 | int refcount; | 147 | atomic_t users; |
| 148 | }; | 148 | }; |
| 149 | 149 | ||
| 150 | #define TTY_LDISC_MAGIC 0x5403 | 150 | #define TTY_LDISC_MAGIC 0x5403 |