git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
h8300
/
kernel
/
ints.c
diff --git
a/arch/h8300/kernel/ints.c
b/arch/h8300/kernel/ints.c
index
7246e29
..
587ef7f
100644
(file)
--- a/
arch/h8300/kernel/ints.c
+++ b/
arch/h8300/kernel/ints.c
@@
-1,5
+1,5
@@
/*
/*
- * linux/arch/h8300/
platform/h8300h
/ints.c
+ * linux/arch/h8300/
kernel
/ints.c
*
* Yoshinori Sato <ysato@users.sourceforge.jp>
*
*
* Yoshinori Sato <ysato@users.sourceforge.jp>
*
@@
-22,13
+22,13
@@
#include <linux/init.h>
#include <linux/random.h>
#include <linux/bootmem.h>
#include <linux/init.h>
#include <linux/random.h>
#include <linux/bootmem.h>
+#include <linux/hardirq.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/traps.h>
#include <asm/io.h>
#include <asm/setup.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/traps.h>
#include <asm/io.h>
#include <asm/setup.h>
-#include <asm/hardirq.h>
#include <asm/errno.h>
/*
#include <asm/errno.h>
/*
@@
-141,7
+141,7
@@
int request_irq(unsigned int irq,
return -EBUSY;
if (use_kmalloc)
return -EBUSY;
if (use_kmalloc)
- irq_handle =
(irq_handler_t *)
kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
+ irq_handle = kmalloc(sizeof(irq_handler_t), GFP_ATOMIC);
else {
/* use bootmem allocater */
irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
else {
/* use bootmem allocater */
irq_handle = (irq_handler_t *)alloc_bootmem(sizeof(irq_handler_t));
@@
-158,7
+158,7
@@
int request_irq(unsigned int irq,
irq_handle->devname = devname;
irq_list[irq] = irq_handle;
irq_handle->devname = devname;
irq_list[irq] = irq_handle;
- if (irq_handle->flags &
SA
_SAMPLE_RANDOM)
+ if (irq_handle->flags &
IRQF
_SAMPLE_RANDOM)
rand_initialize_irq(irq);
enable_irq(irq);
rand_initialize_irq(irq);
enable_irq(irq);
@@
-222,7
+222,7
@@
asmlinkage void process_int(int irq, struct pt_regs *fp)
if (irq_list[irq]) {
irq_list[irq]->handler(irq, irq_list[irq]->dev_id, fp);
irq_list[irq]->count++;
if (irq_list[irq]) {
irq_list[irq]->handler(irq, irq_list[irq]->dev_id, fp);
irq_list[irq]->count++;
- if (irq_list[irq]->flags &
SA
_SAMPLE_RANDOM)
+ if (irq_list[irq]->flags &
IRQF
_SAMPLE_RANDOM)
add_interrupt_randomness(irq);
}
} else {
add_interrupt_randomness(irq);
}
} else {