summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-21 22:00:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-05-21 22:00:12 -0700
commit9956c1120826bce3b42093099a0149b7f62d0b8a (patch)
treeb34de8b27596555be2a84629973d4a692db42c73 /drivers
parent78b58e549a3098a8c1408d0214bd25e5d5e7a3a3 (diff)
parentada44a0430fdd00b3f38aad0aa518e97cb760bd0 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Prevent stack backtrace false positives on trap frames. sparc64: Fix stack tracing through trap frames. sparc64: Fix kernel thread stack termination. sunhv: Fix locking in non-paged I/O case.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/serial/sunhv.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index 145c0281495..2847336742d 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -499,7 +499,6 @@ static void sunhv_console_write_bychar(struct console *con, const char *s, unsig
} else
spin_lock(&port->lock);
- spin_lock_irqsave(&port->lock, flags);
for (i = 0; i < n; i++) {
if (*s == '\n')
sunhv_console_putchar(port, '\r');