Commit 1224f373 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras
Browse files

[POWERPC] Fix iseries/smp.c for irq breakage 



Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 27db2d0c

arch/powerpc/platforms/iseries/irq.c

+2 −5
Original line number Diff line number Diff line
@@ -43,10 +43,7 @@ 
#include "irq.h"

#include "pci.h"

#include "call_pci.h"



#if defined(CONFIG_SMP)

extern void iSeries_smp_message_recv(struct pt_regs *);

#endif

#include "smp.h"



#ifdef CONFIG_PCI
@@ -315,7 +312,7 @@ unsigned int iSeries_get_irq(struct pt_regs *regs) 
#ifdef CONFIG_SMP

	if (get_lppaca()->int_dword.fields.ipi_cnt) {

		get_lppaca()->int_dword.fields.ipi_cnt = 0;

		iSeries_smp_message_recv(regs);

		iSeries_smp_message_recv();

	}

#endif /* CONFIG_SMP */

	if (hvlpevent_is_pending())

arch/powerpc/platforms/iseries/smp.c

+4 −2
Original line number Diff line number Diff line
@@ -43,9 +43,11 @@ 
#include <asm/cputable.h>

#include <asm/system.h>



#include "smp.h"



static unsigned long iSeries_smp_message[NR_CPUS];



void iSeries_smp_message_recv(struct pt_regs *regs)

void iSeries_smp_message_recv(void)

{

	int cpu = smp_processor_id();

	int msg;
@@ -55,7 +57,7 @@ void iSeries_smp_message_recv(struct pt_regs *regs) 


	for (msg = 0; msg < 4; msg++)

		if (test_and_clear_bit(msg, &iSeries_smp_message[cpu]))

			smp_message_recv(msg, regs);

			smp_message_recv(msg);

}



static inline void smp_iSeries_do_message(int cpu, int msg)

arch/powerpc/platforms/iseries/smp.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef _PLATFORMS_ISERIES_SMP_H

#define _PLATFORMS_ISERIES_SMP_H



extern void iSeries_smp_message_recv(void);



#endif	/* _PLATFORMS_ISERIES_SMP_H */