path: root/arch/sparc/prom/printf.c
diff options
authorDavid S. Miller <davem@davemloft.net>2009-09-04 03:38:54 -0700
committerDavid S. Miller <davem@davemloft.net>2009-09-04 03:39:45 -0700
commitbd4352cadfacb9084c97c853b025fac010266c26 (patch)
treeef54f0801dce4822df71cca587421446ad259ebd /arch/sparc/prom/printf.c
parentsparc64: Kill spurious NMI watchdog triggers by increasing limit to 30 seconds. (diff)
sparc64: Fix bootup with mcount in some configs.
Functions invoked early when booting up a cpu can't use tracing because mcount requires a valid 'current_thread_info()' and TLB mappings to be setup. The code path of sun4v_register_mondo_queues --> register_one_mondo is one such case. sun4v_register_mondo_queues already has the necessary 'notrace' annotation, but register_one_mondo does not. Normally register_one_mondo is inlined so the bug doesn't trigger, but with some config/compiler combinations, it won't be so we must properly mark it notrace. While we're here, add 'notrace' annoations to prom_printf and prom_halt so that early error handling won't have the same problem. Reported-by: Alexander Beregalov <a.beregalov@gmail.com> Reported-by: Leif Sawyer <lsawyer@gci.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/sparc/prom/printf.c b/arch/sparc/prom/printf.c
index 660943ee4c2a..ca869266b9f3 100644
--- a/arch/sparc/prom/printf.c
+++ b/arch/sparc/prom/printf.c
@@ -14,14 +14,14 @@
#include <linux/kernel.h>
+#include <linux/compiler.h>
#include <asm/openprom.h>
#include <asm/oplib.h>
static char ppbuf[1024];
-prom_write(const char *buf, unsigned int n)
+void notrace prom_write(const char *buf, unsigned int n)
char ch;
@@ -33,8 +33,7 @@ prom_write(const char *buf, unsigned int n)
-prom_printf(const char *fmt, ...)
+void notrace prom_printf(const char *fmt, ...)
va_list args;
int i;