Commit a64a3bab authored by Jesse Barnes's avatar Jesse Barnes Committed by Linus Torvalds

[PATCH] fix sn_console for CONFIG_SMP=n

I found that sn_console was missing an include and a fix if CONFIG_SMP=n.  
This patch fixes up the two small problems I found.
Signed-off-by: default avatarJesse Barnes <jbarnes@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 887c8014
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
#include <linux/serial_core.h> #include <linux/serial_core.h>
#include <asm/io.h>
#include <asm/sn/simulator.h> #include <asm/sn/simulator.h>
#include <asm/sn/sn2/sn_private.h> #include <asm/sn/sn2/sn_private.h>
#include <asm/sn/sn_sal.h> #include <asm/sn/sn_sal.h>
...@@ -1086,7 +1087,9 @@ sn_sal_console_write(struct console *co, const char *s, unsigned count) ...@@ -1086,7 +1087,9 @@ sn_sal_console_write(struct console *co, const char *s, unsigned count)
spin_unlock_irqrestore(&port->sc_port.lock, flags); spin_unlock_irqrestore(&port->sc_port.lock, flags);
puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count); puts_raw_fixed(port->sc_ops->sal_puts_raw, s, count);
#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT)
} }
#endif
} }
else { else {
/* Not yet registered with serial core - simple case */ /* Not yet registered with serial core - simple case */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment