diff options
| author | Matt Amdur <mba@delphix.com> | 2011-10-31 06:14:21 -0700 |
|---|---|---|
| committer | Matt Amdur <mba@delphix.com> | 2011-10-31 06:14:21 -0700 |
| commit | cfe84b82dd2e28b7d93af98da3176cd8126555f0 (patch) | |
| tree | b6a1170512b2e4cfc192069d925ae361da0929f0 /usr/src/uts/intel/sys | |
| parent | ec2a3953c47b5237197dbb104dbf4182f2088975 (diff) | |
| download | illumos-joyent-cfe84b82dd2e28b7d93af98da3176cd8126555f0.tar.gz | |
1687 Race in determine_platform / get_hwenv causes multi-CPU VM hang at boot
Reviewed by: Adam Leventhal <Adam.Leventhal@delphix.com>
Reviewed by: Eric Schrock <Eric.Schrock@delphix.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Garrett D'Amore <garrett.damore@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/uts/intel/sys')
| -rw-r--r-- | usr/src/uts/intel/sys/x86_archext.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/uts/intel/sys/x86_archext.h b/usr/src/uts/intel/sys/x86_archext.h index c5516be232..80c85df52f 100644 --- a/usr/src/uts/intel/sys/x86_archext.h +++ b/usr/src/uts/intel/sys/x86_archext.h @@ -20,6 +20,7 @@ */ /* * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011 by Delphix. All rights reserved. */ /* * Copyright (c) 2010, Intel Corporation. @@ -762,6 +763,9 @@ extern int opteron_workaround_6323525; extern void patch_workaround_6323525(void); #endif +#if !defined(__xpv) +extern void determine_platform(void); +#endif extern int get_hwenv(void); extern int is_controldom(void); |