svn commit: r275560 - head/sys/cddl/contrib/opensolaris/uts/common/sys

[Xin LI]

Author: delphij
Date: Sat Dec  6 09:11:13 2014
New Revision: 275560
URL: https://svnweb.freebsd.org/changeset/base/275560

Log:
  MFC r275533:
  
  Sync with Illumos.  This have no effect to FreeBSD.
  
  Illumos issue:
      5100 sparc build failed after 5004
  
  MFC after:	2 weeks

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h
Directory Properties:
  head/sys/cddl/contrib/opensolaris/   (props changed)

Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h	Sat Dec  6 07:30:08 2014	(r275559)
+++ head/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h	Sat Dec  6 09:11:13 2014	(r275560)
@@ -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.