[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>
This commit is contained in:
parent
7d9e793463
commit
af3b74df1b
|
@ -63,13 +63,6 @@ static struct mpic *chrp_mpic;
|
||||||
DEFINE_PER_CPU(struct timer_list, heartbeat_timer);
|
DEFINE_PER_CPU(struct timer_list, heartbeat_timer);
|
||||||
unsigned long event_scan_interval;
|
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;
|
extern unsigned long loops_per_jiffy;
|
||||||
|
|
||||||
/* To be replaced by RTAS when available */
|
/* To be replaced by RTAS when available */
|
||||||
|
|
|
@ -34,16 +34,10 @@
|
||||||
#include <asm/time.h>
|
#include <asm/time.h>
|
||||||
#include <asm/pmac_feature.h>
|
#include <asm/pmac_feature.h>
|
||||||
#include <asm/mpic.h>
|
#include <asm/mpic.h>
|
||||||
|
#include <asm/xmon.h>
|
||||||
|
|
||||||
#include "pmac.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
|
#ifdef CONFIG_PPC32
|
||||||
struct pmac_irq_hw {
|
struct pmac_irq_hw {
|
||||||
unsigned int event;
|
unsigned int event;
|
||||||
|
|
|
@ -12,11 +12,14 @@
|
||||||
|
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
|
|
||||||
|
#include <linux/irqreturn.h>
|
||||||
|
|
||||||
#ifdef CONFIG_XMON
|
#ifdef CONFIG_XMON
|
||||||
extern void xmon_setup(void);
|
extern void xmon_setup(void);
|
||||||
extern void xmon_register_spus(struct list_head *list);
|
extern void xmon_register_spus(struct list_head *list);
|
||||||
struct pt_regs;
|
struct pt_regs;
|
||||||
extern int xmon(struct pt_regs *excp);
|
extern int xmon(struct pt_regs *excp);
|
||||||
|
extern irqreturn_t xmon_irq(int, void *);
|
||||||
#else
|
#else
|
||||||
static inline void xmon_setup(void) { };
|
static inline void xmon_setup(void) { };
|
||||||
static inline void xmon_register_spus(struct list_head *list) { };
|
static inline void xmon_register_spus(struct list_head *list) { };
|
||||||
|
|
Loading…
Reference in New Issue