[PATCH] Wrong #ifdefs in OSKit's linux glue code

[Jeroen Dekkers]

In linux/dev/init_osenv.c and linux/shared/osenv.h there is a check for the
INDIRECT_OSENV macro. It is nowhere defined and I can't find anything about
it, except that is used in a couple of other places too. The problem is
that because the code didn't get included, the irq code of the oskit was
used in the linux code instead of oskit-mach's own irq code. I guess this 
check should be changed to #ifndef KNIT as suggested by the end of the
osenv.h (#endif /* !KNIT */). When I changed it it worked at least.

Jeroen Dekkers


diff -urp oskit-20010214.orig/linux/dev/init_osenv.c 
oskit-20010214/linux/dev/init_osenv.c
--- oskit-20010214.orig/linux/dev/init_osenv.c  Fri Aug  4 20:19:35 2000
+++ oskit-20010214/linux/dev/init_osenv.c       Wed Aug 22 17:38:42 2001
@@ -19,7 +19,7 @@
 void
 oskit_linux_init_osenv(oskit_osenv_t *osenv)
 {
-#ifdef INDIRECT_OSENV
+#ifndef KNIT
        oskit_linux_osenv_init(osenv);
 #endif
 }
diff -urp oskit-20010214.orig/linux/shared/osenv.h 
oskit-20010214/linux/shared/osenv.h
--- oskit-20010214.orig/linux/shared/osenv.h    Fri Oct 13 23:56:08 2000
+++ oskit-20010214/linux/shared/osenv.h Wed Aug 22 16:10:51 2001
@@ -32,7 +32,7 @@
 #include <oskit/dev/osenv_sleep.h>
 #include <oskit/dev/native.h>
 
-#ifdef INDIRECT_OSENV
+#ifndef KNIT
 
 /*
  * Sleep/wakeup

pgp4adu3KzNht.pgp
Description: PGP signature