Commit 2ed5e6d0 authored by Greg Ungerer's avatar Greg Ungerer Committed by Linus Torvalds

[PATCH] m68knommu: move some platform irq support out of irq.h

Move some of the m68knommu platform specific irq core support
to its own header, irqnode.h. Having it in asm-m68knommu/irq.h
causes some build pain, since it is included in a number of
common code places (and not all the required definitions will
be included at these places).
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 562d2f8c
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/hardirq.h> #include <linux/hardirq.h>
#include <asm/bootinfo.h> #include <asm/bootinfo.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/irqnode.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#define DEFINE(sym, val) \ #define DEFINE(sym, val) \
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/irqnode.h>
#include <asm/traps.h> #include <asm/traps.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/machdep.h> #include <asm/machdep.h>
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
#define _M68K_IRQ_H_ #define _M68K_IRQ_H_
#include <linux/config.h> #include <linux/config.h>
#include <linux/interrupt.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
#ifdef CONFIG_COLDFIRE #ifdef CONFIG_COLDFIRE
...@@ -82,36 +81,6 @@ extern void (*mach_disable_irq)(unsigned int); ...@@ -82,36 +81,6 @@ extern void (*mach_disable_irq)(unsigned int);
#endif /* CONFIG_M68360 */ #endif /* CONFIG_M68360 */
/*
* This structure is used to chain together the ISRs for a particular
* interrupt source (if it supports chaining).
*/
typedef struct irq_node {
irqreturn_t (*handler)(int, void *, struct pt_regs *);
unsigned long flags;
void *dev_id;
const char *devname;
struct irq_node *next;
} irq_node_t;
/*
* This structure has only 4 elements for speed reasons
*/
typedef struct irq_handler {
irqreturn_t (*handler)(int, void *, struct pt_regs *);
unsigned long flags;
void *dev_id;
const char *devname;
} irq_handler_t;
/* count of spurious interrupts */
extern volatile unsigned int num_spurious;
/*
* This function returns a new irq_node_t
*/
extern irq_node_t *new_irq_node(void);
/* /*
* Some drivers want these entry points * Some drivers want these entry points
*/ */
......
#ifndef _M68K_IRQNODE_H_
#define _M68K_IRQNODE_H_
#include <linux/interrupt.h>
/*
* This structure is used to chain together the ISRs for a particular
* interrupt source (if it supports chaining).
*/
typedef struct irq_node {
irqreturn_t (*handler)(int, void *, struct pt_regs *);
unsigned long flags;
void *dev_id;
const char *devname;
struct irq_node *next;
} irq_node_t;
/*
* This structure has only 4 elements for speed reasons
*/
typedef struct irq_handler {
irqreturn_t (*handler)(int, void *, struct pt_regs *);
unsigned long flags;
void *dev_id;
const char *devname;
} irq_handler_t;
/* count of spurious interrupts */
extern volatile unsigned int num_spurious;
/*
* This function returns a new irq_node_t
*/
extern irq_node_t *new_irq_node(void);
#endif /* _M68K_IRQNODE_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment