Merge branch 'master' into master-gdb_stubs

5 files changed, 19 insertions, 30 deletions

diff --git a/linux/dev/kernel/dma.c b/linux/dev/kernel/dma.c
index 4b569780..bbda4bbf 100644
--- a/linux/dev/kernel/dma.c
+++ b/linux/dev/kernel/dma.c
@@ -80,10 +80,10 @@ int
 request_dma (unsigned int dmanr, const char *device_id)
 {
   if (dmanr >= MAX_DMA_CHANNELS)
-    return -LINUX_EINVAL;
+    return -EINVAL;
   
   if (xchg (&dma_chan_busy[dmanr].lock, 1) != 0)
-    return -LINUX_EBUSY;
+    return -EBUSY;
   
   dma_chan_busy[dmanr].device_id = device_id;
   
diff --git a/linux/dev/kernel/printk.c b/linux/dev/kernel/printk.c
index 1c45b245..7c65d303 100644
--- a/linux/dev/kernel/printk.c
+++ b/linux/dev/kernel/printk.c
@@ -27,6 +27,7 @@
 #include <stdarg.h>
 #include <asm/system.h>
 #include <kern/assert.h>
+#include <kern/printf.h>
 #include <device/cons.h>
 
 static char buf[2048];
@@ -40,7 +41,8 @@ int
 printk (char *fmt, ...)
 {
   va_list args;
-  int n, flags;
+  int n;
+  unsigned long flags;
   char *p, *msg, *buf_end;
   static int msg_level = -1;
   
diff --git a/linux/dev/kernel/resource.c b/linux/dev/kernel/resource.c
index 7a187552..ba107e8e 100644
--- a/linux/dev/kernel/resource.c
+++ b/linux/dev/kernel/resource.c
@@ -131,7 +131,7 @@ release_region (unsigned int from, unsigned int num)
 int
 check_region (unsigned int from, unsigned int num)
 {
-  return (find_gap (&iolist, from, num) == NULL) ? -LINUX_EBUSY : 0;
+  return (find_gap (&iolist, from, num) == NULL) ? -EBUSY : 0;
 }
 
 /* Called from init/main.c to reserve IO ports. */
diff --git a/linux/dev/kernel/sched.c b/linux/dev/kernel/sched.c
index 792c2dae..87906a45 100644
--- a/linux/dev/kernel/sched.c
+++ b/linux/dev/kernel/sched.c
@@ -34,6 +34,9 @@
 
 #include <kern/thread.h>
 #include <kern/sched_prim.h>
+#include <kern/printf.h>
+
+#include <machine/machspl.h>
 
 #define MACH_INCLUDE
 #include <linux/sched.h>
@@ -41,21 +44,13 @@
 #include <linux/fs.h>
 #include <linux/blkdev.h>
 #include <linux/interrupt.h>
+#include <linux/dev/glue/glue.h>
 
 #include <asm/system.h>
 #include <asm/atomic.h>
 
 int securelevel = 0;
 
-extern void *alloc_contig_mem (unsigned, unsigned, unsigned, vm_page_t *);
-extern void free_contig_mem (vm_page_t);
-extern spl_t splhigh (void);
-extern spl_t splx (spl_t);
-extern void linux_soft_intr (void);
-extern int issig (void);
-extern int printf (const char *, ...);
-extern int linux_auto_config;
-
 static void timer_bh (void);
 
 DECLARE_TASK_QUEUE (tq_timer);
@@ -165,7 +160,7 @@ __do_down (struct semaphore *sem, int task_state)
 
 	  if (task_state == TASK_INTERRUPTIBLE && issig ())
 	    {
-	      ret = -LINUX_EINTR;
+	      ret = -EINTR;
 	      atomic_inc (&sem->count);
 	      break;
 	    }
@@ -185,7 +180,7 @@ __do_down (struct semaphore *sem, int task_state)
     {
       if (task_state == TASK_INTERRUPTIBLE && issig ())
 	{
-	  ret = -LINUX_EINTR;
+	  ret = -EINTR;
 	  atomic_inc (&sem->count);
 	  break;
 	}
@@ -326,16 +321,6 @@ schedule (void)
 }
 
 void
-cdrom_sleep (int t)
-{
-  int xxx;
-
-  assert_wait ((event_t) &xxx, TRUE);
-  thread_set_timeout (t);
-  schedule ();
-}
-
-void
 linux_sched_init (void)
 {
   /*
diff --git a/linux/dev/kernel/softirq.c b/linux/dev/kernel/softirq.c
index 96102a7a..ac95a7dd 100644
--- a/linux/dev/kernel/softirq.c
+++ b/linux/dev/kernel/softirq.c
@@ -13,16 +13,18 @@
 #include <linux/interrupt.h>
 #include <asm/system.h>
 
+#include <linux/dev/glue/glue.h>
+
 int bh_mask_count[32];
-unsigned long bh_active = 0;
-unsigned long bh_mask = 0;
+unsigned int bh_active = 0;
+unsigned int bh_mask = 0;
 void (*bh_base[32]) (void);
 
 void
 linux_soft_intr (void)
 {
-  unsigned long active;
-  unsigned long mask, left;
+  unsigned int active;
+  unsigned int mask, left;
   void (**bh) (void);
 
   sti ();
@@ -42,5 +44,5 @@ linux_soft_intr (void)
     }
   return;
 bad_bh:
-  printk ("linux_soft_intr:bad interrupt handler entry %08lx\n", mask);
+  printk ("linux_soft_intr:bad interrupt handler entry %08x\n", mask);
 }