diff options
| author |  Ingo Molnar <mingo@elte.hu>
| 2009-08-11 14:19:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu>
| 2009-08-11 14:19:09 +0200 |
| commit | 89034bc2c7b839702c00a704e79d112737f98be0 (patch) | |
| tree | e65b1f3d4c751baa840efc81bc4734f089379eb3 /include/linux/tty_ldisc.h | |
| parent | tracing/filters: Don't use pred on alloc failure (diff) | |
| parent | pty: fix data loss when stopped (^S/^Q) (diff) | |
| download | linux-89034bc2c7b839702c00a704e79d112737f98be0.tar.gz linux-89034bc2c7b839702c00a704e79d112737f98be0.tar.bz2 linux-89034bc2c7b839702c00a704e79d112737f98be0.zip | |
Merge branch 'linus' into tracing/core
Conflicts:
kernel/trace/trace_events_filter.c
We use the tracing/core version.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/tty_ldisc.h')
| -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 { struct tty_ldisc { struct tty_ldisc_ops *ops; - int refcount; + atomic_t users; }; #define TTY_LDISC_MAGIC 0x5403 |