[src/trunk]: src/sys/rump/librump Actually, put uvm_readahead into rumpkern, ...

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/112b3366a135
branches:  trunk
changeset: 748318:112b3366a135
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Oct 20 10:42:41 2009 +0000

description:
Actually, put uvm_readahead into rumpkern, since while it's
technically vfs stuff, sys_descrip depends on it and readahead
itself uses only the pager interface.

diffstat:

 sys/rump/librump/rumpkern/Makefile.rumpkern |  6 +++++-
 sys/rump/librump/rumpkern/rump.c            |  5 ++---
 sys/rump/librump/rumpvfs/Makefile.rumpvfs   |  4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diffs (71 lines):

diff -r 4defe2e4eb60 -r 112b3366a135 sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Tue Oct 20 10:34:21 2009 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Tue Oct 20 10:42:41 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.54 2009/10/19 22:07:29 christos Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.55 2009/10/20 10:42:41 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -7,6 +7,7 @@
 
 .PATH: ${RUMPTOP}/librump/rumpkern                             \
        ${RUMPTOP}/../kern                                      \
+       ${RUMPTOP}/../uvm                                       \
        ${RUMPTOP}/../conf                                      \
        ${RUMPTOP}/../dev                                       \
        ${RUMPTOP}/../secmodel/suser
@@ -42,6 +43,9 @@
        subr_log.c subr_once.c subr_prf.c subr_specificdata.c           \
        subr_time.c subr_workqueue.c
 
+# sys/uvm
+SRCS+= uvm_readahead.c
+
 # 4.4BSD secmodel.  selection is hardcoded for now
 SRCS+= secmodel_suser.c
 
diff -r 4defe2e4eb60 -r 112b3366a135 sys/rump/librump/rumpkern/rump.c
--- a/sys/rump/librump/rumpkern/rump.c  Tue Oct 20 10:34:21 2009 +0000
+++ b/sys/rump/librump/rumpkern/rump.c  Tue Oct 20 10:42:41 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rump.c,v 1.127 2009/10/19 22:35:11 pooka Exp $ */
+/*     $NetBSD: rump.c,v 1.128 2009/10/20 10:42:41 pooka Exp $ */
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.127 2009/10/19 22:35:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.128 2009/10/20 10:42:41 pooka Exp $");
 
 #include <sys/param.h>
 #include <sys/atomic.h>
@@ -125,7 +125,6 @@
 
 __weak_alias(biodone,rump__unavailable);
 __weak_alias(sopoll,rump__unavailable);
-__weak_alias(uvm_readahead,rump__unavailable);
 
 void rump__unavailable_vfs_panic(void);
 void rump__unavailable_vfs_panic() {panic("vfs component not available");}
diff -r 4defe2e4eb60 -r 112b3366a135 sys/rump/librump/rumpvfs/Makefile.rumpvfs
--- a/sys/rump/librump/rumpvfs/Makefile.rumpvfs Tue Oct 20 10:34:21 2009 +0000
+++ b/sys/rump/librump/rumpvfs/Makefile.rumpvfs Tue Oct 20 10:42:41 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpvfs,v 1.17 2009/10/14 17:29:20 pooka Exp $
+#      $NetBSD: Makefile.rumpvfs,v 1.18 2009/10/20 10:42:41 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -30,7 +30,7 @@
        vfs_syscalls.c vfs_vnops.c vfs_wapbl.c vfs_xattr.c
 
 # sys/uvm
-SRCS+= uvm_readahead.c uvm_vnode.c
+SRCS+= uvm_vnode.c
 
 # sys/miscfs/syncfs
 SRCS+= sync_subr.c sync_vnops.c