diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/libzfs/common/libzfs_status.c | 11 | ||||
| -rw-r--r-- | usr/src/man/man3c/string.3c | 5 | ||||
| -rw-r--r-- | usr/src/pkg/manifests/system-library.man3c.inc | 2 | ||||
| -rw-r--r-- | usr/src/uts/i86pc/os/mp_startup.c | 10 |
4 files changed, 25 insertions, 3 deletions
diff --git a/usr/src/lib/libzfs/common/libzfs_status.c b/usr/src/lib/libzfs/common/libzfs_status.c index 560bacdc37..71b27a1214 100644 --- a/usr/src/lib/libzfs/common/libzfs_status.c +++ b/usr/src/lib/libzfs/common/libzfs_status.c @@ -22,6 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 Steven Hartland. All rights reserved. */ /* @@ -150,6 +151,16 @@ find_vdev_problem(nvlist_t *vdev, int (*func)(uint64_t, uint64_t, uint64_t)) return (B_TRUE); } + /* + * Check any L2 cache devs + */ + if (nvlist_lookup_nvlist_array(vdev, ZPOOL_CONFIG_L2CACHE, &child, + &children) == 0) { + for (c = 0; c < children; c++) + if (find_vdev_problem(child[c], func)) + return (B_TRUE); + } + return (B_FALSE); } diff --git a/usr/src/man/man3c/string.3c b/usr/src/man/man3c/string.3c index 51a7aee7eb..9bc9e4f3bf 100644 --- a/usr/src/man/man3c/string.3c +++ b/usr/src/man/man3c/string.3c @@ -11,7 +11,7 @@ .\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License"). You may not use this file except in compliance with the License. .\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing. See the License for the specific language governing permissions and limitations under the License. .\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE. If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner] -.TH STRING 3C "Aug 1, 2008" +.TH STRING 3C "Jun 19, 2013" .SH NAME string, strcasecmp, strncasecmp, strcat, strncat, strlcat, strchr, strrchr, strcmp, strncmp, strcpy, strncpy, strlcpy, strcspn, strspn, strdup, strlen, @@ -128,7 +128,8 @@ strnlen, strpbrk, strsep, strstr, strtok, strtok_r \- string operations .LP .nf -\fBchar *\fR\fBstrtok_r\fR(\fBchar *\fR\fIs1\fR, \fBconst char *\fR\fIs2\fR, \fBchar **\fR\fIlasts\fR); +\fBchar *\fR\fBstrtok_r\fR(\fBchar *restrict\fR \fIs1\fR, \fBconst char *restrict\fR \fIs2\fR, + \fBchar **restrict\fR \fIlasts\fR); .fi .SS "ISO C++" diff --git a/usr/src/pkg/manifests/system-library.man3c.inc b/usr/src/pkg/manifests/system-library.man3c.inc index 4f8e3aca51..116c6f331e 100644 --- a/usr/src/pkg/manifests/system-library.man3c.inc +++ b/usr/src/pkg/manifests/system-library.man3c.inc @@ -384,6 +384,7 @@ file path=usr/share/man/man3c/getchar_unlocked.3c file path=usr/share/man/man3c/getcpuid.3c file path=usr/share/man/man3c/getcwd.3c file path=usr/share/man/man3c/getdate.3c +file path=usr/share/man/man3c/getdelim.3c file path=usr/share/man/man3c/getdtablesize.3c file path=usr/share/man/man3c/getenv.3c file path=usr/share/man/man3c/getexecname.3c @@ -399,6 +400,7 @@ file path=usr/share/man/man3c/gethostid.3c file path=usr/share/man/man3c/gethostname.3c file path=usr/share/man/man3c/gethrtime.3c file path=usr/share/man/man3c/gethrvtime.3c +file path=usr/share/man/man3c/getline.3c file path=usr/share/man/man3c/getloadavg.3c file path=usr/share/man/man3c/getlogin.3c file path=usr/share/man/man3c/getlogin_r.3c diff --git a/usr/src/uts/i86pc/os/mp_startup.c b/usr/src/uts/i86pc/os/mp_startup.c index f4289939fe..c6e8e4b229 100644 --- a/usr/src/uts/i86pc/os/mp_startup.c +++ b/usr/src/uts/i86pc/os/mp_startup.c @@ -28,6 +28,7 @@ */ /* * Copyright (c) 2012, Joyent, Inc. All rights reserved. + * Copyright 2013 Nexenta Systems, Inc. All rights reserved. */ #include <sys/types.h> @@ -77,6 +78,7 @@ #include <sys/hypervisor.h> #endif #include <sys/cpu_module.h> +#include <sys/ontrap.h> struct cpu cpus[1]; /* CPU data */ struct cpu *cpu[NCPU] = {&cpus[0]}; /* pointers to all CPUs */ @@ -1186,7 +1188,13 @@ workaround_errata(struct cpu *cpu) if (cpuid_opteron_erratum(cpu, 721) > 0) { #if defined(OPTERON_ERRATUM_721) - wrmsr(MSR_AMD_DE_CFG, rdmsr(MSR_AMD_DE_CFG) | AMD_DE_CFG_E721); + on_trap_data_t otd; + + if (!on_trap(&otd, OT_DATA_ACCESS)) + wrmsr(MSR_AMD_DE_CFG, + rdmsr(MSR_AMD_DE_CFG) | AMD_DE_CFG_E721); + no_trap(); + opteron_erratum_721++; #else workaround_warning(cpu, 721); |