diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 13:23:18 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 13:23:18 -0700 |
| commit | 86505fc06b6f1ee8a13473053a41ed01948e2d4f (patch) | |
| tree | 0bd9b7f5a32b7cc8d1aaf19c0085b64afa56a262 /drivers | |
| parent | 9d3bc3d4a42242ff73ae28afb080508cf5070161 (diff) | |
| parent | 7bc3777ca19cf9ecc5533980210f29c51df7fe5e (diff) | |
| download | linux-86505fc06b6f1ee8a13473053a41ed01948e2d4f.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc updates from David Miller:
1) Double spin lock bug in sunhv serial driver, from Dan Carpenter.
2) Use correct RSS estimate when determining whether to grow the huge
TSB or not, from Mike Kravetz.
3) Don't use full three level page tables for hugepages, PMD level is
sufficient. From Nitin Gupta.
4) Mask out extraneous bits from TSB_TAG_ACCESS register, we only want
the address bits.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Trim page tables for 8M hugepages
sparc64 mm: Fix base TSB sizing when hugetlb pages are used
sparc: serial: sunhv: fix a double lock bug
sparc32: off by ones in BUG_ON()
sparc: Don't leak context bits into thread->fault_address
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/sunhv.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/tty/serial/sunhv.c b/drivers/tty/serial/sunhv.c index ca0d3802f2af..4e603d060e80 100644 --- a/drivers/tty/serial/sunhv.c +++ b/drivers/tty/serial/sunhv.c @@ -490,12 +490,6 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig locked = spin_trylock_irqsave(&port->lock, flags); else spin_lock_irqsave(&port->lock, flags); - if (port->sysrq) { - locked = 0; - } else if (oops_in_progress) { - locked = spin_trylock(&port->lock); - } else - spin_lock(&port->lock); for (i = 0; i < n; i++) { if (*s == '\n') |