svn commit: r277545 - stable/10/sys/cddl/contrib/opensolaris/uts/common/sys
Xin LI
delphij at FreeBSD.org
Fri Jan 23 00:19:59 UTC 2015
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 at 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.
More information about the svn-src-stable-10
mailing list