[src/yamt-pagecache]: src/sys fix a merge botch

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

details:   https://anonhg.NetBSD.org/src/rev/c3250643db27
branches:  yamt-pagecache
changeset: 770913:c3250643db27
user:      yamt <yamt%NetBSD.org@localhost>
date:      Thu May 22 19:11:37 2014 +0000

description:
fix a merge botch

diffstat:

 sys/nfs/nfs_subs.c |  7 +++++--
 sys/uvm/uvm_aobj.c |  5 ++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r bd16f34eeac0 -r c3250643db27 sys/nfs/nfs_subs.c
--- a/sys/nfs/nfs_subs.c        Thu May 22 19:11:17 2014 +0000
+++ b/sys/nfs/nfs_subs.c        Thu May 22 19:11:37 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nfs_subs.c,v 1.221.2.5 2014/05/22 11:41:11 yamt Exp $  */
+/*     $NetBSD: nfs_subs.c,v 1.221.2.6 2014/05/22 19:11:37 yamt Exp $  */
 
 /*
  * Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.221.2.5 2014/05/22 11:41:11 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_subs.c,v 1.221.2.6 2014/05/22 19:11:37 yamt Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_nfs.h"
@@ -1763,6 +1763,9 @@
        rw_enter(&nmp->nm_writeverflock, RW_WRITER);
        vfs_vnode_iterator_init(mp, &marker);
        while (vfs_vnode_iterator_next(marker, &vp)) {
+               struct uvm_page_array a;
+               voff_t off;
+
                mutex_enter(vp->v_interlock);
                np = VTONFS(vp);
                if (vp->v_type != VREG || vp->v_mount != mp || np == NULL) {
diff -r bd16f34eeac0 -r c3250643db27 sys/uvm/uvm_aobj.c
--- a/sys/uvm/uvm_aobj.c        Thu May 22 19:11:17 2014 +0000
+++ b/sys/uvm/uvm_aobj.c        Thu May 22 19:11:37 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uvm_aobj.c,v 1.116.2.8 2014/05/22 11:41:19 yamt Exp $  */
+/*     $NetBSD: uvm_aobj.c,v 1.116.2.9 2014/05/22 19:11:57 yamt Exp $  */
 
 /*
  * Copyright (c) 1998 Chuck Silvers, Charles D. Cranor and
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.116.2.8 2014/05/22 11:41:19 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_aobj.c,v 1.116.2.9 2014/05/22 19:11:57 yamt Exp $");
 
 #include "opt_uvmhist.h"
 
@@ -407,7 +407,6 @@
 uao_create(vsize_t size, int flags)
 {
        static struct uvm_aobj kernel_object_store;
-       static int kobj_alloced = 0;
        static int kobj_alloced __diagused = 0;
        pgoff_t pages = round_page(size) >> PAGE_SHIFT;
        struct uvm_aobj *aobj;