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
2984a28
..
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>
*
@@
-23,7
+23,6
@@
#include <linux/random.h>
#include <linux/bootmem.h>
#include <linux/hardirq.h>
#include <linux/random.h>
#include <linux/bootmem.h>
#include <linux/hardirq.h>
-#include <linux/vs_context.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <asm/system.h>
#include <asm/irq.h>
@@
-142,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));
@@
-217,10
+216,7
@@
void disable_irq(unsigned int irq)
asmlinkage void process_int(int irq, struct pt_regs *fp)
{
asmlinkage void process_int(int irq, struct pt_regs *fp)
{
- struct vx_info_save vxis;
-
irq_enter();
irq_enter();
- __enter_vx_admin(&vxis);
h8300_clear_isr(irq);
if (irq >= NR_TRAPS && irq < NR_IRQS) {
if (irq_list[irq]) {
h8300_clear_isr(irq);
if (irq >= NR_TRAPS && irq < NR_IRQS) {
if (irq_list[irq]) {
@@
-232,7
+228,6
@@
asmlinkage void process_int(int irq, struct pt_regs *fp)
} else {
BUG();
}
} else {
BUG();
}
- __leave_vx_admin(&vxis);
irq_exit();
}
irq_exit();
}