summaryrefslogtreecommitdiff
path: root/drivers/char/hvc_console.h
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2008-05-08 14:27:17 +1000
committerPaul Mackerras <paulus@samba.org>2008-05-14 22:31:57 +1000
commit1c8950ff87de950a3b6ccfb26650fc0a56278836 (patch)
tree6491e5a9148fd8e4d275faf725f490065b007715 /drivers/char/hvc_console.h
parent9f1067c2d98ac1c43f0c82892f5647774a6ac759 (diff)
[POWERPC] Make cpus_in_xmon static and remove extern mess from hvc_console.c
This is a little messier than I'd like because xmon.h only exists on powerpc and we can't have a static inline and an extern declaration visible at the same time. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/char/hvc_console.h')
-rw-r--r--drivers/char/hvc_console.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h
index 8c59818050e6..42ffb17e15df 100644
--- a/drivers/char/hvc_console.h
+++ b/drivers/char/hvc_console.h
@@ -60,4 +60,14 @@ extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq,
/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */
extern int __devexit hvc_remove(struct hvc_struct *hp);
+
+#if defined(CONFIG_XMON) && defined(CONFIG_SMP)
+#include <asm/xmon.h>
+#else
+static inline int cpus_are_in_xmon(void)
+{
+ return 0;
+}
+#endif
+
#endif // HVC_CONSOLE_H