Date: Fri, 23 Jan 2015 00:19:59 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r277545 - stable/10/sys/cddl/contrib/opensolaris/uts/common/sys Message-ID: <201501230019.t0N0JxjY005881@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Fri Jan 23 00:19:58 2015 New Revision: 277545 URL: https://svnweb.freebsd.org/changeset/base/277545 Log: MFC r275533: Sync with Illumos. This have no effect to FreeBSD. Illumos issue: 5100 sparc build failed after 5004 Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h ============================================================================== --- stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h Fri Jan 23 00:06:35 2015 (r277544) +++ stable/10/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h Fri Jan 23 00:19:58 2015 (r277545) @@ -21,6 +21,7 @@ /* * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2014 Igor Kozhukhov <ikozhukhov@gmail.com>. */ #ifndef _SYS_CPUVAR_H @@ -31,6 +32,7 @@ #include <sys/disp.h> #include <sys/processor.h> +#include <sys/loadavg.h> #if (defined(_KERNEL) || defined(_KMEMUSER)) && defined(_MACHDEP) #include <sys/machcpuvar.h> #endif @@ -52,15 +54,6 @@ extern "C" { struct squeue_set_s; #define CPU_CACHE_COHERENCE_SIZE 64 -#define S_LOADAVG_SZ 11 -#define S_MOVAVG_SZ 10 - -struct loadavg_s { - int lg_cur; /* current loadavg entry */ - unsigned int lg_len; /* number entries recorded */ - hrtime_t lg_total; /* used to temporarily hold load totals */ - hrtime_t lg_loads[S_LOADAVG_SZ]; /* table of recorded entries */ -}; /* * For fast event tracing.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501230019.t0N0JxjY005881>