Commit af3b74df authored May 08, 2008 by Michael Ellerman Committed by Paul Mackerras May 14, 2008

[POWERPC] Move xmon_irq() declaration into xmon.h



The typdef for irqreturn_t was moved into its own header a
while back, so there's no reason we can't move xmon_irq()
into xmon.h now.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

parent 7d9e7934

arch/powerpc/platforms/chrp/setup.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -63,13 +63,6 @@ static struct mpic *chrp_mpic;
		DEFINE_PER_CPU(struct timer_list, heartbeat_timer);
		unsigned long event_scan_interval;

		/*
		* XXX this should be in xmon.h, but putting it there means xmon.h
		* has to include <linux/interrupt.h> (to get irqreturn_t), which
		* causes all sorts of problems. -- paulus
		*/
		extern irqreturn_t xmon_irq(int, void *);

		extern unsigned long loops_per_jiffy;

		/* To be replaced by RTAS when available */

arch/powerpc/platforms/powermac/pic.c

+1 −7

Original line number	Diff line number	Diff line
		@@ -34,16 +34,10 @@
		#include <asm/time.h>
		#include <asm/pmac_feature.h>
		#include <asm/mpic.h>
		#include <asm/xmon.h>

		#include "pmac.h"

		/*
		* XXX this should be in xmon.h, but putting it there means xmon.h
		* has to include <linux/interrupt.h> (to get irqreturn_t), which
		* causes all sorts of problems. -- paulus
		*/
		extern irqreturn_t xmon_irq(int, void *);

		#ifdef CONFIG_PPC32
		struct pmac_irq_hw {
		unsigned int event;

include/asm-powerpc/xmon.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -12,11 +12,14 @@

		#ifdef __KERNEL__

		#include <linux/irqreturn.h>

		#ifdef CONFIG_XMON
		extern void xmon_setup(void);
		extern void xmon_register_spus(struct list_head *list);
		struct pt_regs;
		extern int xmon(struct pt_regs *excp);
		extern irqreturn_t xmon_irq(int, void *);
		#else
		static inline void xmon_setup(void) { };
		static inline void xmon_register_spus(struct list_head *list) { };