svn commit: r275533 - vendor-sys/illumos/dist/uts/common/sys

[Xin LI]

Author: delphij
Date: Fri Dec  5 23:50:16 2014
New Revision: 275533
URL: https://svnweb.freebsd.org/changeset/base/275533

Log:
  5100 sparc build failed after 5004
  Reviewed by: Garrett D'Amore <garrett at damore.org>
  Reviewed by: Gary Mills <gary_mills at fastmail.fm>
  Approved by: Robert Mustacchi <rm at joyent.com>
  Author: Igor Kozhukhov <ikozhukhov at gmail.com>
  
  illumos/illuoms-gate at 6481fd49a4385db15285ddf89f9c80b45eaaa407

Modified:
  vendor-sys/illumos/dist/uts/common/sys/cpuvar.h

Modified: vendor-sys/illumos/dist/uts/common/sys/cpuvar.h
==============================================================================
--- vendor-sys/illumos/dist/uts/common/sys/cpuvar.h	Fri Dec  5 23:43:15 2014	(r275532)
+++ vendor-sys/illumos/dist/uts/common/sys/cpuvar.h	Fri Dec  5 23:50:16 2014	(r275533)
@@ -22,6 +22,7 @@
 /*
  * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
+ * Copyright 2014 Igor Kozhukhov <ikozhukhov at gmail.com>.
  */
 
 #ifndef _SYS_CPUVAR_H
@@ -32,6 +33,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
@@ -53,15 +55,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.