Module Name: src
Committed By: maxv
Date: Sun Feb 4 17:31:51 UTC 2018
Modified Files:
src/sys/conf: files
src/sys/kern: init_main.c init_sysctl.c kern_clock.c subr_prof.c
src/sys/sys: systm.h
Log Message:
Add a proper defflag for GPROF, and include opt_gprof.h, otherwise we're
not gonna go very far.
To generate a diff of this commit:
cvs rdiff -u -r1.1192 -r1.1193 src/sys/conf/files
cvs rdiff -u -r1.494 -r1.495 src/sys/kern/init_main.c
cvs rdiff -u -r1.213 -r1.214 src/sys/kern/init_sysctl.c
cvs rdiff -u -r1.135 -r1.136 src/sys/kern/kern_clock.c
cvs rdiff -u -r1.47 -r1.48 src/sys/kern/subr_prof.c
cvs rdiff -u -r1.274 -r1.275 src/sys/sys/systm.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1192 src/sys/conf/files:1.1193
--- src/sys/conf/files:1.1192 Thu Jan 18 00:32:48 2018
+++ src/sys/conf/files Sun Feb 4 17:31:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1192 2018/01/18 00:32:48 mrg Exp $
+# $NetBSD: files,v 1.1193 2018/02/04 17:31:51 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -28,6 +28,7 @@ defflag opt_modular.h MODULAR_DEFAULT_A
defflag KEYLOCK
defparam opt_syslimits.h CHILD_MAX OPEN_MAX
defflag opt_diagnostic.h _DIAGNOSTIC
+defflag GPROF
defparam opt_copy_symtab.h makeoptions_COPY_SYMTAB
Index: src/sys/kern/init_main.c
diff -u src/sys/kern/init_main.c:1.494 src/sys/kern/init_main.c:1.495
--- src/sys/kern/init_main.c:1.494 Tue Dec 26 03:58:03 2017
+++ src/sys/kern/init_main.c Sun Feb 4 17:31:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: init_main.c,v 1.494 2017/12/26 03:58:03 msaitoh Exp $ */
+/* $NetBSD: init_main.c,v 1.495 2018/02/04 17:31:51 maxv Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -97,7 +97,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.494 2017/12/26 03:58:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.495 2018/02/04 17:31:51 maxv Exp $");
#include "opt_ddb.h"
#include "opt_inet.h"
@@ -116,6 +116,7 @@ __KERNEL_RCSID(0, "$NetBSD: init_main.c,
#include "opt_rnd_printf.h"
#include "opt_splash.h"
#include "opt_kernhist.h"
+#include "opt_gprof.h"
#if defined(SPLASHSCREEN) && defined(makeoptions_SPLASHSCREEN_IMAGE)
extern void *_binary_splash_image_start;
Index: src/sys/kern/init_sysctl.c
diff -u src/sys/kern/init_sysctl.c:1.213 src/sys/kern/init_sysctl.c:1.214
--- src/sys/kern/init_sysctl.c:1.213 Thu Jun 1 02:45:13 2017
+++ src/sys/kern/init_sysctl.c Sun Feb 4 17:31:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: init_sysctl.c,v 1.213 2017/06/01 02:45:13 chs Exp $ */
+/* $NetBSD: init_sysctl.c,v 1.214 2018/02/04 17:31:51 maxv Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,11 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.213 2017/06/01 02:45:13 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysctl.c,v 1.214 2018/02/04 17:31:51 maxv Exp $");
#include "opt_sysv.h"
#include "opt_compat_netbsd.h"
#include "opt_modular.h"
+#include "opt_gprof.h"
#include "pty.h"
#include <sys/types.h>
Index: src/sys/kern/kern_clock.c
diff -u src/sys/kern/kern_clock.c:1.135 src/sys/kern/kern_clock.c:1.136
--- src/sys/kern/kern_clock.c:1.135 Sun Feb 12 18:43:56 2017
+++ src/sys/kern/kern_clock.c Sun Feb 4 17:31:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_clock.c,v 1.135 2017/02/12 18:43:56 maxv Exp $ */
+/* $NetBSD: kern_clock.c,v 1.136 2018/02/04 17:31:51 maxv Exp $ */
/*-
* Copyright (c) 2000, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,11 +69,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.135 2017/02/12 18:43:56 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_clock.c,v 1.136 2018/02/04 17:31:51 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_dtrace.h"
#include "opt_perfctrs.h"
+#include "opt_gprof.h"
#endif
#include <sys/param.h>
Index: src/sys/kern/subr_prof.c
diff -u src/sys/kern/subr_prof.c:1.47 src/sys/kern/subr_prof.c:1.48
--- src/sys/kern/subr_prof.c:1.47 Thu Jul 10 21:13:52 2014
+++ src/sys/kern/subr_prof.c Sun Feb 4 17:31:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_prof.c,v 1.47 2014/07/10 21:13:52 christos Exp $ */
+/* $NetBSD: subr_prof.c,v 1.48 2018/02/04 17:31:51 maxv Exp $ */
/*-
* Copyright (c) 1982, 1986, 1993
@@ -32,7 +32,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_prof.c,v 1.47 2014/07/10 21:13:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prof.c,v 1.48 2018/02/04 17:31:51 maxv Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_gprof.h"
+#endif
#include <sys/param.h>
#include <sys/systm.h>
Index: src/sys/sys/systm.h
diff -u src/sys/sys/systm.h:1.274 src/sys/sys/systm.h:1.275
--- src/sys/sys/systm.h:1.274 Fri Oct 27 12:25:15 2017
+++ src/sys/sys/systm.h Sun Feb 4 17:31:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: systm.h,v 1.274 2017/10/27 12:25:15 joerg Exp $ */
+/* $NetBSD: systm.h,v 1.275 2018/02/04 17:31:51 maxv Exp $ */
/*-
* Copyright (c) 1982, 1988, 1991, 1993
@@ -42,6 +42,7 @@
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
+#include "opt_gprof.h"
#endif
#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <stdbool.h>
