CVS commit: [yamt-pagecache] src/sys/rump/librump/rumpkern

2012-11-02 Thread YAMAMOTO Takashi 
Module Name:src
Committed By:   yamt
Date:   Fri Nov  2 08:19:04 UTC 2012

Modified Files:
src/sys/rump/librump/rumpkern [yamt-pagecache]: vm.c

Log Message:
fix a merge botch


To generate a diff of this commit:
cvs rdiff -u -r1.120.2.6 -r1.120.2.7 src/sys/rump/librump/rumpkern/vm.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/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.120.2.6 src/sys/rump/librump/rumpkern/vm.c:1.120.2.7
--- src/sys/rump/librump/rumpkern/vm.c:1.120.2.6	Tue Oct 30 17:22:54 2012
+++ src/sys/rump/librump/rumpkern/vm.c	Fri Nov  2 08:19:04 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm.c,v 1.120.2.6 2012/10/30 17:22:54 yamt Exp $	*/
+/*	$NetBSD: vm.c,v 1.120.2.7 2012/11/02 08:19:04 yamt Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -41,7 +41,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.120.2.6 2012/10/30 17:22:54 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.120.2.7 2012/11/02 08:19:04 yamt Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -226,18 +226,6 @@ uvm_pagezero(struct vm_page *pg)
 }
 
 /*
- * uvm_page_locked_p: return true if object associated with page is
- * locked.  this is a weak check for runtime assertions only.
- */
-
-bool
-uvm_page_locked_p(struct vm_page *pg)
-{
-
-	return mutex_owned(pg-uobject-vmobjlock);
-}
-
-/*
  * Misc routines
  */

CVS commit: [yamt-pagecache] src/sys/rump/librump/rumpkern

2012-01-24 Thread YAMAMOTO Takashi 
Module Name:src
Committed By:   yamt
Date:   Wed Jan 25 00:42:35 UTC 2012

Modified Files:
src/sys/rump/librump/rumpkern [yamt-pagecache]: vm.c

Log Message:
uvm_loanabj: take an access pattern hint.


To generate a diff of this commit:
cvs rdiff -u -r1.120.2.3 -r1.120.2.4 src/sys/rump/librump/rumpkern/vm.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/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.120.2.3 src/sys/rump/librump/rumpkern/vm.c:1.120.2.4
--- src/sys/rump/librump/rumpkern/vm.c:1.120.2.3	Sat Jan 14 04:36:39 2012
+++ src/sys/rump/librump/rumpkern/vm.c	Wed Jan 25 00:42:35 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm.c,v 1.120.2.3 2012/01/14 04:36:39 yamt Exp $	*/
+/*	$NetBSD: vm.c,v 1.120.2.4 2012/01/25 00:42:35 yamt Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -41,7 +41,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.120.2.3 2012/01/14 04:36:39 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.120.2.4 2012/01/25 00:42:35 yamt Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -628,7 +628,7 @@ uvm_loanbreak(struct vm_page *pg)
 }
 
 int
-uvm_loanobj(struct uvm_object *uobj, struct uio *uio)
+uvm_loanobj(struct uvm_object *uobj, struct uio *uio, int advice)
 {
 
 	return ENOTSUP;

CVS commit: [yamt-pagecache] src/sys/rump/librump/rumpkern

2012-01-13 Thread YAMAMOTO Takashi 
Module Name:src
Committed By:   yamt
Date:   Sat Jan 14 04:36:39 UTC 2012

Modified Files:
src/sys/rump/librump/rumpkern [yamt-pagecache]: vm.c

Log Message:
implement a rump stub of uvm_loanobj


To generate a diff of this commit:
cvs rdiff -u -r1.120.2.2 -r1.120.2.3 src/sys/rump/librump/rumpkern/vm.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/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.120.2.2 src/sys/rump/librump/rumpkern/vm.c:1.120.2.3
--- src/sys/rump/librump/rumpkern/vm.c:1.120.2.2	Thu Nov 10 14:33:18 2011
+++ src/sys/rump/librump/rumpkern/vm.c	Sat Jan 14 04:36:39 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm.c,v 1.120.2.2 2011/11/10 14:33:18 yamt Exp $	*/
+/*	$NetBSD: vm.c,v 1.120.2.3 2012/01/14 04:36:39 yamt Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -41,7 +41,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.120.2.2 2011/11/10 14:33:18 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.120.2.3 2012/01/14 04:36:39 yamt Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -627,6 +627,13 @@ uvm_loanbreak(struct vm_page *pg)
 	panic(%s: unimplemented, __func__);
 }
 
+int
+uvm_loanobj(struct uvm_object *uobj, struct uio *uio)
+{
+
+	return ENOTSUP;
+}
+
 void
 ubc_purge(struct uvm_object *uobj)
 {

CVS commit: [yamt-pagecache] src/sys/rump/librump/rumpkern

2011-11-30 Thread YAMAMOTO Takashi 
Module Name:src
Committed By:   yamt
Date:   Wed Nov 30 14:36:37 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern [yamt-pagecache]: scheduler.c

Log Message:
implement a rump version of kpreempt_disabled


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.27.2.1 src/sys/rump/librump/rumpkern/scheduler.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/scheduler.c
diff -u src/sys/rump/librump/rumpkern/scheduler.c:1.27 src/sys/rump/librump/rumpkern/scheduler.c:1.27.2.1
--- src/sys/rump/librump/rumpkern/scheduler.c:1.27	Mon Oct 31 13:17:22 2011
+++ src/sys/rump/librump/rumpkern/scheduler.c	Wed Nov 30 14:36:36 2011
@@ -1,4 +1,4 @@
-/*  $NetBSD: scheduler.c,v 1.27 2011/10/31 13:17:22 yamt Exp $	*/
+/*  $NetBSD: scheduler.c,v 1.27.2.1 2011/11/30 14:36:36 yamt Exp $	*/
 
 /*
  * Copyright (c) 2010, 2011 Antti Kantee.  All Rights Reserved.
@@ -26,7 +26,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.27 2011/10/31 13:17:22 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: scheduler.c,v 1.27.2.1 2011/11/30 14:36:36 yamt Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -512,6 +512,13 @@ kpreempt_enable(void)
 	KPREEMPT_ENABLE(curlwp);
 }
 
+bool
+kpreempt_disabled(void)
+{
+
+	return true;
+}
+
 void
 suspendsched(void)
 {

CVS commit: [yamt-pagecache] src/sys/rump/librump/rumpkern

2011-11-10 Thread YAMAMOTO Takashi 
Module Name:src
Committed By:   yamt
Date:   Thu Nov 10 14:33:18 UTC 2011

Modified Files:
src/sys/rump/librump/rumpkern [yamt-pagecache]: vm.c

Log Message:
remove uobj-memq


To generate a diff of this commit:
cvs rdiff -u -r1.120.2.1 -r1.120.2.2 src/sys/rump/librump/rumpkern/vm.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/vm.c
diff -u src/sys/rump/librump/rumpkern/vm.c:1.120.2.1 src/sys/rump/librump/rumpkern/vm.c:1.120.2.2
--- src/sys/rump/librump/rumpkern/vm.c:1.120.2.1	Wed Nov  2 21:53:59 2011
+++ src/sys/rump/librump/rumpkern/vm.c	Thu Nov 10 14:33:18 2011
@@ -1,4 +1,4 @@
-/*	$NetBSD: vm.c,v 1.120.2.1 2011/11/02 21:53:59 yamt Exp $	*/
+/*	$NetBSD: vm.c,v 1.120.2.2 2011/11/10 14:33:18 yamt Exp $	*/
 
 /*
  * Copyright (c) 2007-2011 Antti Kantee.  All Rights Reserved.
@@ -41,7 +41,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.120.2.1 2011/11/02 21:53:59 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm.c,v 1.120.2.2 2011/11/10 14:33:18 yamt Exp $);
 
 #include sys/param.h
 #include sys/atomic.h
@@ -162,7 +162,6 @@ uvm_pagealloc_strat(struct uvm_object *u
 		uvm_pagezero(pg);
 	}
 
-	TAILQ_INSERT_TAIL(uobj-memq, pg, listq.queue);
 	error = radix_tree_insert_node(uobj-uo_pages,
 	pg-offset  PAGE_SHIFT, pg);
 	KASSERT(error == 0);
@@ -201,8 +200,6 @@ uvm_pagefree(struct vm_page *pg)
 	if (pg-flags  PG_WANTED)
 		wakeup(pg);
 
-	TAILQ_REMOVE(uobj-memq, pg, listq.queue);
-
 	uobj-uo_npages--;
 	opg = radix_tree_remove_node(uobj-uo_pages, pg-offset  PAGE_SHIFT);
 	KASSERT(pg == opg);