Merge branch 'linus' into x86/paravirt-spinlocks

[mirror_ubuntu-artful-kernel.git] / drivers / char / hvc_console.h

diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h
index 96b7401319c19650fed079edeb8f12dce760f886..42ffb17e15df7d4f038f483cc16da4b1a42baf3f 100644 (file)
--- a/drivers/char/hvc_console.h
+++ b/drivers/char/hvc_console.h
@@ -56,8 +56,18 @@ extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
 
 /* register a vterm for hvc tty operation (module_init or hotplug add) */
 extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq,
-                                                struct hv_ops *ops);
+                               struct hv_ops *ops, int outbuf_size);
 /* 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