Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a19eee5e 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 SMP bootup with CONFIG_STACK_DEBUG or ftrace.
  sparc64: Fix OOPS in psycho_pcierr_intr_other().
parents 764527a1 9843099f

arch/sparc64/kernel/irq.c

+3 −2
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <linux/module.h>

#include <linux/sched.h>

#include <linux/linkage.h>

#include <linux/ptrace.h>

#include <linux/errno.h>

#include <linux/kernel_stat.h>
@@ -866,7 +867,7 @@ static void kill_prom_timer(void) 
	: "g1", "g2");

}



void init_irqwork_curcpu(void)

void notrace init_irqwork_curcpu(void)

{

	int cpu = hard_smp_processor_id();
@@ -897,7 +898,7 @@ static void __cpuinit register_one_mondo(unsigned long paddr, unsigned long type 
	}

}



void __cpuinit sun4v_register_mondo_queues(int this_cpu)

void __cpuinit notrace sun4v_register_mondo_queues(int this_cpu)

{

	struct trap_per_cpu *tb = &trap_block[this_cpu];

arch/sparc64/kernel/pci_psycho.c

+5 −3
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm, int is_pbm 
{

	unsigned long csr_reg, csr, csr_error_bits;

	irqreturn_t ret = IRQ_NONE;

	u16 stat;

	u16 stat, *addr;



	if (is_pbm_a) {

		csr_reg = pbm->controller_regs + PSYCHO_PCIA_CTRL;
@@ -597,7 +597,9 @@ static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm, int is_pbm 
			printk("%s: PCI SERR signal asserted.\n", pbm->name);

		ret = IRQ_HANDLED;

	}

	pci_read_config_word(pbm->pci_bus->self, PCI_STATUS, &stat);

	addr = psycho_pci_config_mkaddr(pbm, pbm->pci_first_busno,

					0, PCI_STATUS);

	pci_config_read16(addr, &stat);

	if (stat & (PCI_STATUS_PARITY |

		    PCI_STATUS_SIG_TARGET_ABORT |

		    PCI_STATUS_REC_TARGET_ABORT |
@@ -605,7 +607,7 @@ static irqreturn_t psycho_pcierr_intr_other(struct pci_pbm_info *pbm, int is_pbm 
		    PCI_STATUS_SIG_SYSTEM_ERROR)) {

		printk("%s: PCI bus error, PCI_STATUS[%04x]\n",

		       pbm->name, stat);

		pci_write_config_word(pbm->pci_bus->self, PCI_STATUS, 0xffff);

		pci_config_write16(addr, 0xffff);

		ret = IRQ_HANDLED;

	}

	return ret;

arch/sparc64/kernel/traps.c

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 


#include <linux/module.h>

#include <linux/sched.h>

#include <linux/linkage.h>

#include <linux/kernel.h>

#include <linux/signal.h>

#include <linux/smp.h>
@@ -2453,7 +2454,7 @@ struct trap_per_cpu trap_block[NR_CPUS]; 
/* This can get invoked before sched_init() so play it super safe

 * and use hard_smp_processor_id().

 */

void init_cur_cpu_trap(struct thread_info *t)

void notrace init_cur_cpu_trap(struct thread_info *t)

{

	int cpu = hard_smp_processor_id();

	struct trap_per_cpu *p = &trap_block[cpu];