Commit d3acd16c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents 93697a3c bd4352ca

arch/sparc/kernel/irq_64.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

arch/sparc/kernel/nmi.c

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ notrace __kprobes void perfctr_irq(int irq, struct pt_regs *regs) 
	}

	if (!touched && __get_cpu_var(last_irq_sum) == sum) {

		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",

				regs, panic_on_timeout);

	} else {

arch/sparc/prom/misc_64.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

arch/sparc/prom/printf.c

+3 −4
Original line number Diff line number Diff line
@@ -14,14 +14,14 @@ 
 */



#include <linux/kernel.h>

#include <linux/compiler.h>



#include <asm/openprom.h>

#include <asm/oplib.h>



static char ppbuf[1024];



void

prom_write(const char *buf, unsigned int n)

void notrace prom_write(const char *buf, unsigned int n)

{

	char ch;
@@ -33,8 +33,7 @@ prom_write(const char *buf, unsigned int n) 
	}

}



void

prom_printf(const char *fmt, ...)

void notrace prom_printf(const char *fmt, ...)

{

	va_list args;

	int i;