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/misc_64.c | |
parent | 93697a3cabd3605c434a9b915c0272ad800b3f97 (diff) | |
parent | bd4352cadfacb9084c97c853b025fac010266c26 (diff) | |
download | linux-3.10-d3acd16cda3a1cbaff7c579c0e054f0ece613d14.tar.gz linux-3.10-d3acd16cda3a1cbaff7c579c0e054f0ece613d14.tar.bz2 linux-3.10-d3acd16cda3a1cbaff7c579c0e054f0ece613d14.zip |
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/misc_64.c')
-rw-r--r-- | arch/sparc/prom/misc_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/prom/misc_64.c b/arch/sparc/prom/misc_64.c index eedffb4fec2..39fc6af21b7 100644 --- a/arch/sparc/prom/misc_64.c +++ b/arch/sparc/prom/misc_64.c @@ -88,7 +88,7 @@ void prom_cmdline(void) /* Drop into the prom, but completely terminate the program. * No chance of continuing. */ -void prom_halt(void) +void notrace prom_halt(void) { #ifdef CONFIG_SUN_LDOMS if (ldom_domaining_enabled) |