summaryrefslogtreecommitdiff
path: root/usr/src/uts/common
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/common')
-rw-r--r--usr/src/uts/common/fs/ufs/ufs_filio.c6
-rw-r--r--usr/src/uts/common/fs/ufs/ufs_lockfs.c4
-rw-r--r--usr/src/uts/common/os/kstat_fr.c13
-rw-r--r--usr/src/uts/common/sys/Makefile1
-rw-r--r--usr/src/uts/common/sys/vm.h11
-rw-r--r--usr/src/uts/common/sys/vmmeter.h76
-rw-r--r--usr/src/uts/common/vm/vm_pvn.c4
7 files changed, 7 insertions, 108 deletions
diff --git a/usr/src/uts/common/fs/ufs/ufs_filio.c b/usr/src/uts/common/fs/ufs/ufs_filio.c
index b4b33435e0..6d63801a5e 100644
--- a/usr/src/uts/common/fs/ufs/ufs_filio.c
+++ b/usr/src/uts/common/fs/ufs/ufs_filio.c
@@ -19,12 +19,9 @@
* CDDL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
*/
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/types.h>
#include <sys/t_lock.h>
#include <sys/param.h>
@@ -50,7 +47,6 @@
#include <sys/mman.h>
#include <sys/pathname.h>
#include <sys/debug.h>
-#include <sys/vmmeter.h>
#include <sys/vmsystm.h>
#include <sys/cmn_err.h>
#include <sys/filio.h>
diff --git a/usr/src/uts/common/fs/ufs/ufs_lockfs.c b/usr/src/uts/common/fs/ufs/ufs_lockfs.c
index bbcad8883b..66715344bb 100644
--- a/usr/src/uts/common/fs/ufs/ufs_lockfs.c
+++ b/usr/src/uts/common/fs/ufs/ufs_lockfs.c
@@ -19,8 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2009 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1991, 2010, Oracle and/or its affiliates. All rights reserved.
*/
#include <sys/types.h>
@@ -48,7 +47,6 @@
#include <sys/mman.h>
#include <sys/pathname.h>
#include <sys/debug.h>
-#include <sys/vmmeter.h>
#include <sys/vmsystm.h>
#include <sys/cmn_err.h>
#include <sys/acct.h>
diff --git a/usr/src/uts/common/os/kstat_fr.c b/usr/src/uts/common/os/kstat_fr.c
index 29c9054f8b..7eab08f982 100644
--- a/usr/src/uts/common/os/kstat_fr.c
+++ b/usr/src/uts/common/os/kstat_fr.c
@@ -19,8 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1992, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/*
@@ -46,7 +45,6 @@
#include <sys/vfs.h>
#include <sys/dnlc.h>
#include <sys/var.h>
-#include <sys/vmmeter.h>
#include <sys/debug.h>
#include <sys/kobj.h>
#include <sys/avl.h>
@@ -546,15 +544,6 @@ kstat_init(void)
kstat_install(ksp);
}
-#ifdef VAC
- ksp = kstat_create("unix", 0, "flushmeter", "hat", KSTAT_TYPE_RAW,
- sizeof (struct flushmeter), KSTAT_FLAG_VIRTUAL);
- if (ksp) {
- ksp->ks_data = (void *) &flush_cnt;
- kstat_install(ksp);
- }
-#endif /* VAC */
-
ksp = kstat_create("unix", 0, "var", "misc", KSTAT_TYPE_RAW,
sizeof (struct var), KSTAT_FLAG_VIRTUAL);
if (ksp) {
diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile
index 63883cfcbb..acebf3dc1e 100644
--- a/usr/src/uts/common/sys/Makefile
+++ b/usr/src/uts/common/sys/Makefile
@@ -628,7 +628,6 @@ CHKHDRS= \
vm_usage.h \
vmem.h \
vmem_impl.h \
- vmmeter.h \
vmsystm.h \
vnic.h \
vnic_impl.h \
diff --git a/usr/src/uts/common/sys/vm.h b/usr/src/uts/common/sys/vm.h
index 6018c29c93..6f812e2dfa 100644
--- a/usr/src/uts/common/sys/vm.h
+++ b/usr/src/uts/common/sys/vm.h
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,8 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2001 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1983, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
@@ -40,10 +38,7 @@
#ifndef _SYS_VM_H
#define _SYS_VM_H
-#pragma ident "%Z%%M% %I% %E% SMI"
-
#include <sys/vmparam.h>
-#include <sys/vmmeter.h>
#include <sys/vmsystm.h>
#include <sys/sysmacros.h>
diff --git a/usr/src/uts/common/sys/vmmeter.h b/usr/src/uts/common/sys/vmmeter.h
deleted file mode 100644
index 5da4459347..0000000000
--- a/usr/src/uts/common/sys/vmmeter.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 1996 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-/* Copyright (c) 1983, 1984, 1985, 1986, 1987, 1988, 1989 AT&T */
-/* All Rights Reserved */
-
-/*
- * University Copyright- Copyright (c) 1982, 1986, 1988
- * The Regents of the University of California
- * All Rights Reserved
- *
- * University Acknowledgment- Portions of this document are derived from
- * software developed by the University of California, Berkeley, and its
- * contributors.
- */
-
-#ifndef _SYS_VMMETER_H
-#define _SYS_VMMETER_H
-
-#pragma ident "%Z%%M% %I% %E% SMI"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*
- * Virtual Address Cache flush instrumentation.
- *
- * Everything from f_first to f_last must be unsigned [int].
- */
-struct flushmeter {
-#define f_first f_ctx
- unsigned f_ctx; /* No. of context flushes */
- unsigned f_segment; /* No. of segment flushes */
- unsigned f_page; /* No. of complete page flushes */
- unsigned f_partial; /* No. of partial page flushes */
- unsigned f_usr; /* No. of non-supervisor flushes */
- unsigned f_region; /* No. of region flushes */
-#define f_last f_region
-};
-
-#ifdef _KERNEL
-#ifdef VAC
-/* cnt is 1 sec accum; rate is 5 sec avg; sum is grand total */
-struct flushmeter flush_cnt;
-#endif /* VAC */
-#endif /* _KERNEL */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _SYS_VMMETER_H */
diff --git a/usr/src/uts/common/vm/vm_pvn.c b/usr/src/uts/common/vm/vm_pvn.c
index 22e7a89a34..7233581227 100644
--- a/usr/src/uts/common/vm/vm_pvn.c
+++ b/usr/src/uts/common/vm/vm_pvn.c
@@ -19,8 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2010 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
+ * Copyright (c) 1986, 2010, Oracle and/or its affiliates. All rights reserved.
*/
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
@@ -50,7 +49,6 @@
#include <sys/buf.h>
#include <sys/vnode.h>
#include <sys/uio.h>
-#include <sys/vmmeter.h>
#include <sys/vmsystm.h>
#include <sys/mman.h>
#include <sys/vfs.h>
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-06 03:14:16 +0000