GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

Browse source 
* 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.
This commit is contained in:
Linus Torvalds 2009-09-05 13:49:06 -07:00
commit d3acd16cda
4 changed files with 6 additions and 7 deletions
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/kernel/nmi.c
View file

@ -103,7 +103,7 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs)
} }
if (!touched && __get_cpu_var(last_irq_sum) == sum) { if (!touched && __get_cpu_var(last_irq_sum) == sum) {
local_inc(&__get_cpu_var(alert_counter)); local_inc(&__get_cpu_var(alert_counter));
if (local_read(&__get_cpu_var(alert_counter)) == 5 * nmi_hz) if (local_read(&__get_cpu_var(alert_counter)) == 30 * nmi_hz)
die_nmi("BUG: NMI Watchdog detected LOCKUP", die_nmi("BUG: NMI Watchdog detected LOCKUP",
regs, panic_on_timeout); regs, panic_on_timeout);
} else { } else {

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;