aboutsummaryrefslogtreecommitdiffstats
path: root/include/xen/hvc-console.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-05-29 09:31:50 +0200
committerIngo Molnar <mingo@elte.hu>2008-05-29 09:31:57 +0200
commit0261ac5f2f43a1906cfacfb19d62ed643d162cbe (patch)
tree2f200d6dd14dd744835d87d667d5006258692800 /include/xen/hvc-console.h
parentb20aeccd6ad42ccb6be1b3d1d32618ddd2b31bf0 (diff)
downloadmrst-s0i3-test-0261ac5f2f43a1906cfacfb19d62ed643d162cbe.tar.gz
mrst-s0i3-test-0261ac5f2f43a1906cfacfb19d62ed643d162cbe.tar.xz
mrst-s0i3-test-0261ac5f2f43a1906cfacfb19d62ed643d162cbe.zip
xen: fix "xen: implement save/restore"
-tip testing found the following build breakage: drivers/built-in.o: In function `xen_suspend': manage.c:(.text+0x4390f): undefined reference to `xen_console_resume' with this config: http://redhat.com/~mingo/misc/config-Thu_May_29_09_23_16_CEST_2008.bad i have bisected it down to: | commit 0e91398f2a5d4eb6b07df8115917d0d1cf3e9b58 | Author: Jeremy Fitzhardinge <jeremy@goop.org> | Date: Mon May 26 23:31:27 2008 +0100 | | xen: implement save/restore the problem is that drivers/xen/manage.c is built unconditionally if CONFIG_XEN is enabled and makes use of xen_suspend(), but drivers/char/hvc_xen.c, where the xen_suspend() method is implemented, is only build if CONFIG_HVC_XEN=y as well. i have solved this by providing a NOP implementation for xen_suspend() in the !CONFIG_HVC_XEN case. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/xen/hvc-console.h')
-rw-r--r--include/xen/hvc-console.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/xen/hvc-console.h b/include/xen/hvc-console.h
index fd5483a059b..98b79bc404d 100644
--- a/include/xen/hvc-console.h
+++ b/include/xen/hvc-console.h
@@ -3,7 +3,11 @@
extern struct console xenboot_console;
+#ifdef CONFIG_HVC_XEN
void xen_console_resume(void);
+#else
+static inline void xen_console_resume(void) { }
+#endif
void xen_raw_console_write(const char *str);
void xen_raw_printk(const char *fmt, ...);