diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 17:21:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-16 17:21:00 -0700 |
| commit | f74b9444192c60603020c61d7915b72893137edc (patch) | |
| tree | 8b1d16d373234038c2b045c9ceb3c33b93059e8a /drivers/tty/vt | |
| parent | 7a6362800cb7d1d618a697a650c7aaed3eb39320 (diff) | |
| parent | 4ba8216cd90560bc402f52076f64d8546e8aefcb (diff) | |
| download | kernel_samsung_smdk4412-f74b9444192c60603020c61d7915b72893137edc.zip kernel_samsung_smdk4412-f74b9444192c60603020c61d7915b72893137edc.tar.gz kernel_samsung_smdk4412-f74b9444192c60603020c61d7915b72893137edc.tar.bz2 | |
Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl
* 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
BKL: That's all, folks
fs/locks.c: Remove stale FIXME left over from BKL conversion
ipx: remove the BKL
appletalk: remove the BKL
x25: remove the BKL
ufs: remove the BKL
hpfs: remove the BKL
drivers: remove extraneous includes of smp_lock.h
tracing: don't trace the BKL
adfs: remove the big kernel lock
Diffstat (limited to 'drivers/tty/vt')
| -rw-r--r-- | drivers/tty/vt/selection.c | 1 | ||||
| -rw-r--r-- | drivers/tty/vt/vc_screen.c | 1 | ||||
| -rw-r--r-- | drivers/tty/vt/vt.c | 1 | ||||
| -rw-r--r-- | drivers/tty/vt/vt_ioctl.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/drivers/tty/vt/selection.c b/drivers/tty/vt/selection.c index c956ed6..adf0ad2 100644 --- a/drivers/tty/vt/selection.c +++ b/drivers/tty/vt/selection.c @@ -26,7 +26,6 @@ #include <linux/selection.h> #include <linux/tiocl.h> #include <linux/console.h> -#include <linux/smp_lock.h> /* Don't take this from <ctype.h>: 011-015 on the screen aren't spaces */ #define isspace(c) ((c) == ' ') diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c index 7b3bfbe..1564261 100644 --- a/drivers/tty/vt/vc_screen.c +++ b/drivers/tty/vt/vc_screen.c @@ -33,7 +33,6 @@ #include <linux/kbd_kern.h> #include <linux/console.h> #include <linux/device.h> -#include <linux/smp_lock.h> #include <linux/sched.h> #include <linux/fs.h> #include <linux/poll.h> diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 798df6f..c83cdfb 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -89,7 +89,6 @@ #include <linux/mutex.h> #include <linux/vt_kern.h> #include <linux/selection.h> -#include <linux/smp_lock.h> #include <linux/tiocl.h> #include <linux/kbd_kern.h> #include <linux/consolemap.h> diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c index b648049..937d172 100644 --- a/drivers/tty/vt/vt_ioctl.c +++ b/drivers/tty/vt/vt_ioctl.c @@ -27,7 +27,6 @@ #include <linux/console.h> #include <linux/consolemap.h> #include <linux/signal.h> -#include <linux/smp_lock.h> #include <linux/timex.h> #include <asm/io.h> |