diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-08-06 21:40:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 13:47:44 -0700 |
| commit | b07471fa51358ce64cc25e1501544502362e4404 (patch) | |
| tree | 0bd1889eb3cbabe51f15cc5e971f9644cdced0f3 /include/linux/tty.h | |
| parent | ddcd9fb66ae7f448b517242c10a31d4e17bcad45 (diff) | |
| download | linux-3.10-b07471fa51358ce64cc25e1501544502362e4404.tar.gz linux-3.10-b07471fa51358ce64cc25e1501544502362e4404.tar.bz2 linux-3.10-b07471fa51358ce64cc25e1501544502362e4404.zip | |
tty: implement BTM as mutex instead of BKL
The tty locking now follows the rules for mutexes, so
we can replace the BKL usage with a new subsystem
wide mutex.
Using a regular mutex here will change the behaviour
when blocked on the BTM from spinning to sleeping,
but that should not be visible to the user.
Using the mutex also means that all the BTM is now
covered by lockdep.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include/linux/tty.h')
| -rw-r--r-- | include/linux/tty.h | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index 0fbafb0b69b..1437da3ddc6 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -578,20 +578,12 @@ extern int vt_ioctl(struct tty_struct *tty, struct file *file, extern long vt_compat_ioctl(struct tty_struct *tty, struct file * file, unsigned int cmd, unsigned long arg); +/* tty_mutex.c */ /* functions for preparation of BKL removal */ -static inline void tty_lock(void) __acquires(kernel_lock) -{ -#ifdef CONFIG_LOCK_KERNEL - /* kernel_locked is 1 for !CONFIG_LOCK_KERNEL */ - WARN_ON(kernel_locked()); -#endif - lock_kernel(); -} -static inline void tty_unlock(void) __releases(kernel_lock) -{ - unlock_kernel(); -} -#define tty_locked() (kernel_locked()) +extern void __lockfunc tty_lock(void) __acquires(tty_lock); +extern void __lockfunc tty_unlock(void) __releases(tty_lock); +extern struct task_struct *__big_tty_mutex_owner; +#define tty_locked() (current == __big_tty_mutex_owner) /* * wait_event_interruptible_tty -- wait for a condition with the tty lock held |