CVS commit: [yamt-pagecache] src/sys/uvm

[YAMAMOTO Takashi]

Module Name:    src
Committed By:   yamt
Date:           Thu May 22 19:11:57 UTC 2014

Modified Files:
        src/sys/uvm [yamt-pagecache]: uvm_aobj.c

Log Message:
fix a merge botch


To generate a diff of this commit:
cvs rdiff -u -r1.116.2.8 -r1.116.2.9 src/sys/uvm/uvm_aobj.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/uvm/uvm_aobj.c
diff -u src/sys/uvm/uvm_aobj.c:1.116.2.8 src/sys/uvm/uvm_aobj.c:1.116.2.9
--- src/sys/uvm/uvm_aobj.c:1.116.2.8	Thu May 22 11:41:19 2014
+++ src/sys/uvm/uvm_aobj.c	Thu May 22 19:11:57 2014
@@ -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 @@ struct uvm_object *
 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;