adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

sparc64: Fix bootup with mcount in some configs.

Browse source 
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>
This commit is contained in:
David S. Miller 2009-09-04 03:38:54 -07:00
parent e6617c6ec2
commit bd4352cadf
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/sparc/kernel/irq_64.c
View file

@ -886,7 +886,7 @@ void notrace init_irqwork_curcpu(void)
* Therefore you cannot make any OBP calls, not even prom_printf, * Therefore you cannot make any OBP calls, not even prom_printf,
* from these two routines. * from these two routines.
*/ */
static void __cpuinit register_one_mondo(unsigned long paddr, unsigned long type, unsigned long qmask) static void __cpuinit notrace register_one_mondo(unsigned long paddr, unsigned long type, unsigned long qmask)
{ {
unsigned long num_entries = (qmask + 1) / 64; unsigned long num_entries = (qmask + 1) / 64;
unsigned long status; unsigned long status;

2
arch/sparc/prom/misc_64.c
View file

@ -88,7 +88,7 @@ void prom_cmdline(void)
/* Drop into the prom, but completely terminate the program. /* Drop into the prom, but completely terminate the program.
* No chance of continuing. * No chance of continuing.
*/ */
void prom_halt(void) void notrace prom_halt(void)
{ {
#ifdef CONFIG_SUN_LDOMS #ifdef CONFIG_SUN_LDOMS
if (ldom_domaining_enabled) if (ldom_domaining_enabled)

7
arch/sparc/prom/printf.c
View file

@ -14,14 +14,14 @@
*/ */
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/compiler.h>
#include <asm/openprom.h> #include <asm/openprom.h>
#include <asm/oplib.h> #include <asm/oplib.h>
static char ppbuf[1024]; static char ppbuf[1024];
void void notrace prom_write(const char *buf, unsigned int n)
prom_write(const char *buf, unsigned int n)
{ {
char ch; char ch;
@ -33,8 +33,7 @@ prom_write(const char *buf, unsigned int n)
} }
} }
void void notrace prom_printf(const char *fmt, ...)
prom_printf(const char *fmt, ...)
{ {
va_list args; va_list args;
int i; int i;