X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fh8300%2Fkernel%2Fints.c;h=587ef7f4fcc777394d7d8fc08cd80f9974077cff;hb=refs%2Fheads%2Fvserver;hp=2984a28cbba2dceb6b744800702792fba13e4d24;hpb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;p=linux-2.6.git

diff --git a/arch/h8300/kernel/ints.c b/arch/h8300/kernel/ints.c
index 2984a28cb..587ef7f4f 100644
--- 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>
  *
@@ -23,7 +23,6 @@
 #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>
@@ -142,7 +141,7 @@ int request_irq(unsigned int irq,
 		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));
@@ -217,10 +216,7 @@ void disable_irq(unsigned int irq)
 
 asmlinkage void process_int(int irq, struct pt_regs *fp)
 {
-	struct vx_info_save vxis;
-
 	irq_enter();
-	__enter_vx_admin(&vxis);
 	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();
 	}
-	__leave_vx_admin(&vxis);
 	irq_exit();
 }