CVS commit: src/sys/rump/librump/rumpkern/arch/i386
Module Name:src
Committed By: christos
Date: Tue Jan 22 22:10:22 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern/arch/i386: spinlock.c
Log Message:
use the definitions from lock.h
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpkern/arch/i386/spinlock.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/arch/i386/spinlock.c
diff -u src/sys/rump/librump/rumpkern/arch/i386/spinlock.c:1.1 src/sys/rump/librump/rumpkern/arch/i386/spinlock.c:1.2
--- src/sys/rump/librump/rumpkern/arch/i386/spinlock.c:1.1 Mon May 31 18:31:07 2010
+++ src/sys/rump/librump/rumpkern/arch/i386/spinlock.c Tue Jan 22 17:10:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: spinlock.c,v 1.1 2010/05/31 22:31:07 pooka Exp $ */
+/* $NetBSD: spinlock.c,v 1.2 2013/01/22 22:10:22 christos Exp $ */
/*-
* Copyright (c) 2000, 2006 The NetBSD Foundation, Inc.
@@ -30,49 +30,10 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: spinlock.c,v 1.1 2010/05/31 22:31:07 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spinlock.c,v 1.2 2013/01/22 22:10:22 christos Exp $");
#define _HARDKERNEL /* XXX: non-inline prototypes */
+#define SPINLOCK_BODY
#include
#undef _HARDKERNEL
-
-/*
- * Spinlocks, from src/sys/arch/x86/include/lock.h
- */
-void
-__cpu_simple_lock_init(__cpu_simple_lock_t *lockp)
-{
-
- *lockp = __SIMPLELOCK_UNLOCKED;
- __insn_barrier();
-}
-
-int
-__cpu_simple_lock_try(__cpu_simple_lock_t *lockp)
-{
- uint8_t val;
-
- val = __SIMPLELOCK_LOCKED;
- __asm volatile ("xchgb %0,(%2)" :
- "=r" (val)
- :"0" (val), "r" (lockp));
- __insn_barrier();
- return val == __SIMPLELOCK_UNLOCKED;
-}
-
-void
-__cpu_simple_lock(__cpu_simple_lock_t *lockp)
-{
-
- while (!__cpu_simple_lock_try(lockp))
- /* nothing */;
- __insn_barrier();
-}
-
-void
-__cpu_simple_unlock(__cpu_simple_lock_t *lockp)
-{
-
- __insn_barrier();
- *lockp = __SIMPLELOCK_UNLOCKED;
-}
+#undef SPINLOCK_BODY
CVS commit: src/sys/rump/librump/rumpkern/arch/i386
Module Name:src
Committed By: joerg
Date: Sun Jul 22 20:32:31 UTC 2012
Modified Files:
src/sys/rump/librump/rumpkern/arch/i386: pmap_x86.c
Log Message:
Needs pmap_write_protect to finish DBG=-g build with clang.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpkern/arch/i386/pmap_x86.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/arch/i386/pmap_x86.c
diff -u src/sys/rump/librump/rumpkern/arch/i386/pmap_x86.c:1.2 src/sys/rump/librump/rumpkern/arch/i386/pmap_x86.c:1.3
--- src/sys/rump/librump/rumpkern/arch/i386/pmap_x86.c:1.2 Thu Jun 17 08:22:02 2010
+++ src/sys/rump/librump/rumpkern/arch/i386/pmap_x86.c Sun Jul 22 20:32:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_x86.c,v 1.2 2010/06/17 08:22:02 pooka Exp $ */
+/* $NetBSD: pmap_x86.c,v 1.3 2012/07/22 20:32:31 joerg Exp $ */
/*
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap_x86.c,v 1.2 2010/06/17 08:22:02 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_x86.c,v 1.3 2012/07/22 20:32:31 joerg Exp $");
#include
@@ -103,3 +103,8 @@ pmap_extract(pmap_t pmap, vaddr_t va, pa
*pap = va;
return true;
}
+
+void
+pmap_write_protect(pmap_t pmap, vaddr_t sva, vaddr_t eva, vm_prot_t prot)
+{
+}
CVS commit: src/sys/rump/librump/rumpkern/arch/i386
Module Name:src Committed By: pooka Date: Thu Jun 17 08:22:02 UTC 2010 Modified Files: src/sys/rump/librump/rumpkern/arch/i386: pmap_x86.c Log Message: Give the kernel pmap a container in case some tries to access it via some pmap.h macro. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpkern/arch/i386/pmap_x86.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/arch/i386/pmap_x86.c diff -u src/sys/rump/librump/rumpkern/arch/i386/pmap_x86.c:1.1 src/sys/rump/librump/rumpkern/arch/i386/pmap_x86.c:1.2 --- src/sys/rump/librump/rumpkern/arch/i386/pmap_x86.c:1.1 Wed Jun 16 11:45:21 2010 +++ src/sys/rump/librump/rumpkern/arch/i386/pmap_x86.c Thu Jun 17 08:22:02 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_x86.c,v 1.1 2010/06/16 11:45:21 pooka Exp $ */ +/* $NetBSD: pmap_x86.c,v 1.2 2010/06/17 08:22:02 pooka Exp $ */ /* * Copyright (c) 2010 Antti Kantee. All Rights Reserved. @@ -26,13 +26,14 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap_x86.c,v 1.1 2010/06/16 11:45:21 pooka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap_x86.c,v 1.2 2010/06/17 08:22:02 pooka Exp $"); #include #include -struct pmap *const kernel_pmap_ptr = (struct pmap *const)-1; +static struct pmap thepmap; +struct pmap *const kernel_pmap_ptr = &thepmap; void pmap_kenter_pa(vaddr_t va, paddr_t pa, vm_prot_t prot, u_int fl)
CVS commit: src/sys/rump/librump/rumpkern/arch/i386
Module Name:src
Committed By: pooka
Date: Wed Apr 28 00:34:25 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern/arch/i386: rumpcpu.c
Log Message:
set first attached cpu as primary
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/rumpkern/arch/i386/rumpcpu.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/arch/i386/rumpcpu.c
diff -u src/sys/rump/librump/rumpkern/arch/i386/rumpcpu.c:1.8 src/sys/rump/librump/rumpkern/arch/i386/rumpcpu.c:1.9
--- src/sys/rump/librump/rumpkern/arch/i386/rumpcpu.c:1.8 Tue Apr 27 23:30:30 2010
+++ src/sys/rump/librump/rumpkern/arch/i386/rumpcpu.c Wed Apr 28 00:34:25 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpcpu.c,v 1.8 2010/04/27 23:30:30 pooka Exp $ */
+/* $NetBSD: rumpcpu.c,v 1.9 2010/04/28 00:34:25 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rumpcpu.c,v 1.8 2010/04/27 23:30:30 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpcpu.c,v 1.9 2010/04/28 00:34:25 pooka Exp $");
#include
@@ -43,6 +43,9 @@
rump_cpu_attach(struct cpu_info *ci)
{
+ if (cpu_info_list == NULL)
+ ci->ci_flags |= CPUF_PRIMARY;
+
/* XXX: wrong order, but ... */
ci->ci_next = cpu_info_list;
cpu_info_list = ci;
