Module Name: src
Committed By: matt
Date: Mon Jul 30 23:56:49 UTC 2012
Modified Files:
src/sys/sys: kernhist.h
src/sys/uvm: uvm_loan.c uvm_map.c uvm_pdaemon.c uvm_stat.h uvm_vnode.c
Log Message:
-fno-common broke kernhist since it used commons.
Add a KERNHIST_DEFINE which is define the kernel history.
Change UVM to deal with the new usage.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/sys/kernhist.h
cvs rdiff -u -r1.82 -r1.83 src/sys/uvm/uvm_loan.c
cvs rdiff -u -r1.317 -r1.318 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.106 -r1.107 src/sys/uvm/uvm_pdaemon.c
cvs rdiff -u -r1.50 -r1.51 src/sys/uvm/uvm_stat.h
cvs rdiff -u -r1.98 -r1.99 src/sys/uvm/uvm_vnode.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/sys/kernhist.h
diff -u src/sys/sys/kernhist.h:1.4 src/sys/sys/kernhist.h:1.5
--- src/sys/sys/kernhist.h:1.4 Mon Nov 21 04:36:05 2011
+++ src/sys/sys/kernhist.h Mon Jul 30 23:56:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: kernhist.h,v 1.4 2011/11/21 04:36:05 christos Exp $ */
+/* $NetBSD: kernhist.h,v 1.5 2012/07/30 23:56:48 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -93,6 +93,7 @@ LIST_HEAD(kern_history_head, kern_histor
*/
#ifndef KERNHIST
#define KERNHIST_DECL(NAME)
+#define KERNHIST_DEFINE(NAME)
#define KERNHIST_INIT(NAME,N)
#define KERNHIST_INIT_STATIC(NAME,BUF)
#define KERNHIST_LOG(NAME,FMT,A,B,C,D)
@@ -106,7 +107,8 @@ LIST_HEAD(kern_history_head, kern_histor
extern struct kern_history_head kern_histories;
-#define KERNHIST_DECL(NAME) struct kern_history NAME
+#define KERNHIST_DECL(NAME) extern struct kern_history NAME
+#define KERNHIST_DEFINE(NAME) struct kern_history NAME
#define KERNHIST_INIT(NAME,N) \
do { \
Index: src/sys/uvm/uvm_loan.c
diff -u src/sys/uvm/uvm_loan.c:1.82 src/sys/uvm/uvm_loan.c:1.83
--- src/sys/uvm/uvm_loan.c:1.82 Sun Feb 19 00:05:56 2012
+++ src/sys/uvm/uvm_loan.c Mon Jul 30 23:56:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_loan.c,v 1.82 2012/02/19 00:05:56 rmind Exp $ */
+/* $NetBSD: uvm_loan.c,v 1.83 2012/07/30 23:56:48 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_loan.c,v 1.82 2012/02/19 00:05:56 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_loan.c,v 1.83 2012/07/30 23:56:48 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -41,6 +41,10 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_loan.c,v
#include <uvm/uvm.h>
+#ifdef UVMHIST
+UVMHIST_DEFINE(loanhist);
+#endif
+
/*
* "loaned" pages are pages which are (read-only, copy-on-write) loaned
* from the VM system to other parts of the kernel. this allows page
Index: src/sys/uvm/uvm_map.c
diff -u src/sys/uvm/uvm_map.c:1.317 src/sys/uvm/uvm_map.c:1.318
--- src/sys/uvm/uvm_map.c:1.317 Sun Apr 8 11:27:45 2012
+++ src/sys/uvm/uvm_map.c Mon Jul 30 23:56:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_map.c,v 1.317 2012/04/08 11:27:45 martin Exp $ */
+/* $NetBSD: uvm_map.c,v 1.318 2012/07/30 23:56:48 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.317 2012/04/08 11:27:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v 1.318 2012/07/30 23:56:48 matt Exp $");
#include "opt_ddb.h"
#include "opt_uvmhist.h"
@@ -100,6 +100,10 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_map.c,v
#include <uvm/uvm_ddb.h>
#endif
+#ifdef UVMHIST
+UVMHIST_DEFINE(maphist);
+#endif
+
#if !defined(UVMMAP_COUNTERS)
#define UVMMAP_EVCNT_DEFINE(name) /* nothing */
Index: src/sys/uvm/uvm_pdaemon.c
diff -u src/sys/uvm/uvm_pdaemon.c:1.106 src/sys/uvm/uvm_pdaemon.c:1.107
--- src/sys/uvm/uvm_pdaemon.c:1.106 Tue Jun 5 22:51:47 2012
+++ src/sys/uvm/uvm_pdaemon.c Mon Jul 30 23:56:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pdaemon.c,v 1.106 2012/06/05 22:51:47 jym Exp $ */
+/* $NetBSD: uvm_pdaemon.c,v 1.107 2012/07/30 23:56:48 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.106 2012/06/05 22:51:47 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.107 2012/07/30 23:56:48 matt Exp $");
#include "opt_uvmhist.h"
#include "opt_readahead.h"
@@ -83,6 +83,10 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.
#include <uvm/uvm.h>
#include <uvm/uvm_pdpolicy.h>
+#ifdef UVMHIST
+UVMHIST_DEFINE(pdhist);
+#endif
+
/*
* UVMPD_NUMDIRTYREACTS is how many dirty pages the pagedaemon will reactivate
* in a pass thru the inactive list when swap is full. the value should be
Index: src/sys/uvm/uvm_stat.h
diff -u src/sys/uvm/uvm_stat.h:1.50 src/sys/uvm/uvm_stat.h:1.51
--- src/sys/uvm/uvm_stat.h:1.50 Tue May 17 04:18:07 2011
+++ src/sys/uvm/uvm_stat.h Mon Jul 30 23:56:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_stat.h,v 1.50 2011/05/17 04:18:07 mrg Exp $ */
+/* $NetBSD: uvm_stat.h,v 1.51 2012/07/30 23:56:48 matt Exp $ */
/*
* Copyright (c) 2011 Matthew R. Green
@@ -52,6 +52,7 @@
#ifdef UVMHIST
#define UVMHIST_DECL(NAME) KERNHIST_DECL(NAME)
+#define UVMHIST_DEFINE(NAME) KERNHIST_DEFINE(NAME)
#define UVMHIST_INIT(NAME,N) KERNHIST_INIT(NAME,N)
#define UVMHIST_INIT_STATIC(NAME,BUF) KERNHIST_INIT_STATIC(NAME,BUF)
#define UVMHIST_LOG(NAME,FMT,A,B,C,D) KERNHIST_LOG(NAME,FMT,A,B,C,D)
@@ -61,6 +62,7 @@
#else
#define UVMHIST_DECL(NAME)
+#define UVMHIST_DEFINE(NAME)
#define UVMHIST_INIT(NAME,N)
#define UVMHIST_INIT_STATIC(NAME,BUF)
#define UVMHIST_LOG(NAME,FMT,A,B,C,D)
Index: src/sys/uvm/uvm_vnode.c
diff -u src/sys/uvm/uvm_vnode.c:1.98 src/sys/uvm/uvm_vnode.c:1.99
--- src/sys/uvm/uvm_vnode.c:1.98 Fri Jun 1 14:52:48 2012
+++ src/sys/uvm/uvm_vnode.c Mon Jul 30 23:56:48 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_vnode.c,v 1.98 2012/06/01 14:52:48 martin Exp $ */
+/* $NetBSD: uvm_vnode.c,v 1.99 2012/07/30 23:56:48 matt Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -45,7 +45,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.98 2012/06/01 14:52:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,v 1.99 2012/07/30 23:56:48 matt Exp $");
#include "opt_uvmhist.h"
@@ -65,6 +65,10 @@ __KERNEL_RCSID(0, "$NetBSD: uvm_vnode.c,
#include <uvm/uvm.h>
#include <uvm/uvm_readahead.h>
+#ifdef UVMHIST
+UVMHIST_DEFINE(ubchist);
+#endif
+
/*
* functions
*/
