linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / um / kernel / sigio_kern.c

diff --git a/arch/um/kernel/sigio_kern.c b/arch/um/kernel/sigio_kern.c
index 1c1300f..2299884 100644 (file)
--- a/arch/um/kernel/sigio_kern.c
+++ b/arch/um/kernel/sigio_kern.c
@@ -1,4 +1,4 @@
-/*
+/* 
  * Copyright (C) 2002 - 2003 Jeff Dike (jdike@addtoit.com)
  * Licensed under the GPL
  */
@@ -12,16 +12,13 @@
 #include "sigio.h"
 #include "irq_user.h"
 #include "irq_kern.h"
-#include "os.h"
 
 /* Protected by sigio_lock() called from write_sigio_workaround */
 static int sigio_irq_fd = -1;
 
 static irqreturn_t sigio_interrupt(int irq, void *data, struct pt_regs *unused)
 {
-       char c;
-
-       os_read_file(sigio_irq_fd, &c, sizeof(c));
+       read_sigio_fd(sigio_irq_fd);
        reactivate_fd(sigio_irq_fd, SIGIO_WRITE_IRQ);
        return(IRQ_HANDLED);
 }
@@ -54,9 +51,6 @@ void sigio_unlock(void)
        spin_unlock(&sigio_spinlock);
 }
 
-extern void sigio_cleanup(void);
-__uml_exitcall(sigio_cleanup);
-
 /*
  * Overrides for Emacs so that we follow Linus's tabbing style.
  * Emacs will notice this stuff at the end of the file and automatically