diff options
| author | jdike <jdike> | 2003-05-22 16:00:44 +0000 |
|---|---|---|
| committer | jdike <jdike> | 2003-05-22 16:00:44 +0000 |
| commit | 8aab25f7247e784e6bff78cc4bd049fd8cde8fc7 (patch) | |
| tree | 24f3c437417e0c66781f209b96b5a0e4b93fed43 | |
| parent | ab6ad17eb8cce726441febdd1a2c7032eb141169 (diff) | |
| download | uml-history-8aab25f7247e784e6bff78cc4bd049fd8cde8fc7.tar.gz | |
Backported some irq cleanups from 2.5.v_2_4_20_5
| -rw-r--r-- | arch/um/include/irq_kern.h | 27 | ||||
| -rw-r--r-- | arch/um/kernel/sigio_kern.c | 1 | ||||
| -rw-r--r-- | include/asm-um/irq.h | 14 |
3 files changed, 28 insertions, 14 deletions
diff --git a/arch/um/include/irq_kern.h b/arch/um/include/irq_kern.h new file mode 100644 index 0000000..4f68577 --- /dev/null +++ b/arch/um/include/irq_kern.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com) + * Licensed under the GPL + */ + +#ifndef __IRQ_KERN_H__ +#define __IRQ_KERN_H__ + +#include "linux/interrupt.h" + +extern int um_request_irq(unsigned int irq, int fd, int type, + void (*handler)(int, void *, struct pt_regs *), + unsigned long irqflags, const char * devname, + void *dev_id); + +#endif + +/* + * Overrides for Emacs so that we follow Linus's tabbing style. + * Emacs will notice this stuff at the end of the file and automatically + * adjust the settings for this buffer only. This must remain at the end + * of the file. + * --------------------------------------------------------------------------- + * Local variables: + * c-file-style: "linux" + * End: + */ diff --git a/arch/um/kernel/sigio_kern.c b/arch/um/kernel/sigio_kern.c index 02272e6..d634250 100644 --- a/arch/um/kernel/sigio_kern.c +++ b/arch/um/kernel/sigio_kern.c @@ -10,6 +10,7 @@ #include "init.h" #include "sigio.h" #include "irq_user.h" +#include "irq_kern.h" /* Protected by sigio_lock() called from write_sigio_workaround */ static int sigio_irq_fd = -1; diff --git a/include/asm-um/irq.h b/include/asm-um/irq.h index a561e76..de389a4 100644 --- a/include/asm-um/irq.h +++ b/include/asm-um/irq.h @@ -1,16 +1,6 @@ #ifndef __UM_IRQ_H #define __UM_IRQ_H -/* The i386 irq.h has a struct task_struct in a prototype without including - * sched.h. This forward declaration kills the resulting warning. - */ -struct task_struct; - -#include "asm/arch/irq.h" -#include "asm/ptrace.h" - -#undef NR_IRQS - #define TIMER_IRQ 0 #define UMN_IRQ 1 #define CONSOLE_IRQ 2 @@ -29,8 +19,4 @@ struct task_struct; #define LAST_IRQ XTERM_IRQ #define NR_IRQS (LAST_IRQ + 1) -extern int um_request_irq(unsigned int irq, int fd, int type, - void (*handler)(int, void *, struct pt_regs *), - unsigned long irqflags, const char * devname, - void *dev_id); #endif |