diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 22:49:06 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-05 22:49:06 +0200 |
| commit | d3acd16cda3a1cbaff7c579c0e054f0ece613d14 (patch) | |
| tree | 2467a3fcf23e54ca68545427feb4e2d19f083b75 /arch/sparc/kernel/irq_64.c | |
| parent | Merge branch 'perfcounters-fixes-for-linus' of git://git.kernel.org/pub/scm/l... (diff) | |
| parent | sparc64: Fix bootup with mcount in some configs. (diff) | |
| download | linux-d3acd16cda3a1cbaff7c579c0e054f0ece613d14.tar.xz linux-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/kernel/irq_64.c')
| -rw-r--r-- | arch/sparc/kernel/irq_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c index f0ee79055409..8daab33fc17d 100644 --- a/arch/sparc/kernel/irq_64.c +++ b/arch/sparc/kernel/irq_64.c @@ -886,7 +886,7 @@ void notrace init_irqwork_curcpu(void) * Therefore you cannot make any OBP calls, not even prom_printf, * 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 status; |