Module Name: src
Committed By: pooka
Date: Sat Aug 8 00:46:57 UTC 2009
Modified Files:
src/sys/rump/librump/rumpkern: pmap_stub.c
Log Message:
arm32 (but not arm26) wants to be different and #define pmap_remove()
as pmap_do_remove(). Compensate.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/librump/rumpkern/pmap_stub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/pmap_stub.c
diff -u src/sys/rump/librump/rumpkern/pmap_stub.c:1.14 src/sys/rump/librump/rumpkern/pmap_stub.c:1.15
--- src/sys/rump/librump/rumpkern/pmap_stub.c:1.14 Thu Aug 6 11:50:19 2009
+++ src/sys/rump/librump/rumpkern/pmap_stub.c Sat Aug 8 00:46:56 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_stub.c,v 1.14 2009/08/06 11:50:19 pooka Exp $ */
+/* $NetBSD: pmap_stub.c,v 1.15 2009/08/08 00:46:56 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,12 +29,13 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_stub.c,v 1.14 2009/08/06 11:50:19 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_stub.c,v 1.15 2009/08/08 00:46:56 pooka Exp $");
#include <sys/param.h>
#include <uvm/uvm_extern.h>
+/* get your kicks on pmap 66 */
struct pmap *const kernel_pmap_ptr = (struct pmap *const)0x66;
/*
@@ -107,12 +108,24 @@
panic("%s: unavailable", __func__);
}
+/*
+ * It's a brave new world. arm32 pmap is different (even from arm26)
+ */
+#if defined(__arm__) && !defined(__PROG26)
+void
+pmap_do_remove(pmap_t pmap, vaddr_t sva, vaddr_t eva, int eger)
+{
+
+ panic("%s: unavailable", __func__);
+}
+#else
void
pmap_remove(pmap_t pmap, vaddr_t sva, vaddr_t eva)
{
panic("%s: unavailable", __func__);
}
+#endif
#ifndef __vax__
bool
