From f6fcac02fbd3182f067f69bfb256298cd4c3b37f Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Sat, 4 Aug 2007 15:47:18 +0000
Subject: 2007-08-04  Samuel Thibault  <samuel.thibault@ens-lyon.org>

* i386/i386/io_perm.c (i386_io_perm_create): Lock io_perm->port, not
	inexistent device->port.
	* i386/i386/mp_desc.c: Include <machine/vm_param.h>
	* i386/i386/mp_desc.h: Include <i386at/idt.h> instead of "idt.h"
---
 i386/i386/io_perm.c | 2 +-
 i386/i386/mp_desc.c | 1 +
 i386/i386/mp_desc.h | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'i386')

diff --git a/i386/i386/io_perm.c b/i386/i386/io_perm.c
index 3a03408..df25cc6 100644
--- a/i386/i386/io_perm.c
+++ b/i386/i386/io_perm.c
@@ -209,7 +209,7 @@ i386_io_perm_create (ipc_port_t master_port, io_port_t from, io_port_t to,
   ipc_port_t notify;
 
   notify = ipc_port_make_sonce(io_perm->port);
-  ip_lock(device->port);
+  ip_lock(io_perm->port);
   ipc_port_nsrequest(io_perm->port, 1, notify, &notify);
   assert(notify == IP_NULL);
 
diff --git a/i386/i386/mp_desc.c b/i386/i386/mp_desc.c
index e1ac9c3..300ea7a 100644
--- a/i386/i386/mp_desc.c
+++ b/i386/i386/mp_desc.c
@@ -38,6 +38,7 @@
 #include <machine/ktss.h>
 #include <machine/tss.h>
 #include <machine/io_perm.h>
+#include <machine/vm_param.h>
 
 /*
  * The i386 needs an interrupt stack to keep the PCB stack from being
diff --git a/i386/i386/mp_desc.h b/i386/i386/mp_desc.h
index 8ae272b..03d7194 100644
--- a/i386/i386/mp_desc.h
+++ b/i386/i386/mp_desc.h
@@ -40,7 +40,7 @@
 
 #include "seg.h"
 #include "tss.h"
-#include "idt.h"
+#include <i386at/idt.h>
 #include "gdt.h"
 #include "ldt.h"
 
-- 
cgit v1.2.3