summaryrefslogtreecommitdiff
path: root/i386
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2007-08-04 15:47:18 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-06-18 00:27:11 +0200
commitf6fcac02fbd3182f067f69bfb256298cd4c3b37f (patch)
treefcdd4c7ccb25ac10f140f3b00548ca1a2b975d73 /i386
parent9d192270768f68a222a42f8e7be5089d7e0ce4c3 (diff)
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"
Diffstat (limited to 'i386')
-rw-r--r--i386/i386/io_perm.c2
-rw-r--r--i386/i386/mp_desc.c1
-rw-r--r--i386/i386/mp_desc.h2
3 files changed, 3 insertions, 2 deletions
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"