diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-04 12:38:54 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-04 12:39:45 +0200 |
| commit | bd4352cadfacb9084c97c853b025fac010266c26 (patch) | |
| tree | ef54f0801dce4822df71cca587421446ad259ebd /arch/sparc/prom/misc_64.c | |
| parent | sparc64: Kill spurious NMI watchdog triggers by increasing limit to 30 seconds. (diff) | |
| download | linux-bd4352cadfacb9084c97c853b025fac010266c26.tar.xz linux-bd4352cadfacb9084c97c853b025fac010266c26.zip | |
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 '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 eedffb4fec2d..39fc6af21b7c 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) |