diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 13:49:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 13:49:06 -0700 |
| commit | d3acd16cda3a1cbaff7c579c0e054f0ece613d14 (patch) | |
| tree | 2467a3fcf23e54ca68545427feb4e2d19f083b75 /arch/sparc/prom/printf.c | |
| parent | 93697a3cabd3605c434a9b915c0272ad800b3f97 (diff) | |
| parent | bd4352cadfacb9084c97c853b025fac010266c26 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix bootup with mcount in some configs.
sparc64: Kill spurious NMI watchdog triggers by increasing limit to 30 seconds.
Diffstat (limited to 'arch/sparc/prom/printf.c')
| -rw-r--r-- | arch/sparc/prom/printf.c | 7 |
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]; -void -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) } } -void -prom_printf(const char *fmt, ...) +void notrace prom_printf(const char *fmt, ...) { va_list args; int i; |