Commit 5d5c8930 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] m68k interrupt handling fix

From: Geert Uytterhoeven <geert@linux-m68k.org>

The syscalls.h change broke the m68k interrupt management code, since
sys_{request,free}_irq() are not syscalls, but routines to manage system
(CPU) interrupts.
parent f57a9b9f
......@@ -49,7 +49,6 @@
#include <asm/amigahw.h>
#include <asm/amigaints.h>
#include <asm/amipcmcia.h>
#include <asm/unistd.h>
extern int cia_request_irq(struct ciabase *base,int irq,
irqreturn_t (*handler)(int, void *, struct pt_regs *),
......
......@@ -20,7 +20,6 @@
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/traps.h>
#include <asm/unistd.h>
static irqreturn_t bvme6000_defhand (int irq, void *dev_id, struct pt_regs *fp);
......
......@@ -17,7 +17,6 @@
#include <asm/io.h>
#include <asm/system.h>
#include <asm/traps.h>
#include <asm/unistd.h>
#include "ints.h"
/* Clock hardware definitions */
......
......@@ -118,7 +118,6 @@
#include <asm/macints.h>
#include <asm/mac_iop.h>
#include <asm/mac_oss.h>
#include <asm/unistd.h>
/*#define DEBUG_IOP*/
......
......@@ -133,7 +133,6 @@
#include <asm/hwtest.h>
#include <asm/errno.h>
#include <asm/macints.h>
#include <asm/unistd.h>
#define DEBUG_SPURIOUS
#define SHUTUP_SONIC
......
......@@ -26,7 +26,6 @@
#include <asm/macints.h>
#include <asm/mac_via.h>
#include <asm/mac_oss.h>
#include <asm/unistd.h>
int oss_present;
volatile struct mac_oss *oss;
......
......@@ -24,7 +24,6 @@
#include <asm/macintosh.h>
#include <asm/macints.h>
#include <asm/mac_psc.h>
#include <asm/unistd.h>
#define DEBUG_PSC
......
......@@ -32,7 +32,6 @@
#include <asm/machw.h>
#include <asm/mac_via.h>
#include <asm/mac_psc.h>
#include <asm/unistd.h>
volatile __u8 *via1, *via2;
#if 0
......
......@@ -26,7 +26,6 @@
#include <asm/irq.h>
#include <asm/hardirq.h>
#include <asm/traps.h>
#include <asm/unistd.h>
#include <asm/q40_master.h>
#include <asm/q40ints.h>
......
......@@ -15,7 +15,6 @@
#include <asm/intersil.h>
#include <asm/oplib.h>
#include <asm/sun3ints.h>
#include <asm/unistd.h>
#include <linux/seq_file.h>
extern void sun3_leds (unsigned char);
......
......@@ -76,6 +76,11 @@ extern void (*disable_irq)(unsigned int);
struct pt_regs;
extern int sys_request_irq(unsigned int,
irqreturn_t (*)(int, void *, struct pt_regs *),
unsigned long, const char *, void *);
extern void sys_free_irq(unsigned int, void *);
/*
* various flags for request_irq() - the Amiga now uses the standard
* mechanism like all other architectures - SA_INTERRUPT and SA_SHIRQ
......
......@@ -376,10 +376,6 @@ asmlinkage int sys_pipe(unsigned long *fildes);
asmlinkage int sys_ptrace(long request, long pid, long addr, long data);
asmlinkage long sys_ioperm(unsigned long from, unsigned long num, int on);
struct pt_regs;
int sys_request_irq(unsigned int,
irqreturn_t (*)(int, void *, struct pt_regs *),
unsigned long, const char *, void *);
void sys_free_irq(unsigned int, void *);
struct sigaction;
asmlinkage long sys_rt_sigaction(int sig,
const struct sigaction __user *act,
......
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