diff options
| author | Christopher Kiick <Chris.Kiick@Sun.COM> | 2010-03-11 18:19:56 -0500 |
|---|---|---|
| committer | Christopher Kiick <Chris.Kiick@Sun.COM> | 2010-03-11 18:19:56 -0500 |
| commit | e557d412e15c7f384b2ea3bf316a739a0f81cd55 (patch) | |
| tree | f29c6b63d3976f5103dbca9dd7cdbbe374b1b55a /usr/src/lib | |
| parent | de6d0fcd730431ea0d586564c1551016efe19f56 (diff) | |
| download | illumos-gate-e557d412e15c7f384b2ea3bf316a739a0f81cd55.tar.gz | |
6830088 Fast reboot support for SPARC platforms
--HG--
rename : usr/src/cmd/halt/smf/Makefile => usr/src/cmd/halt/smf.i386/Makefile
rename : usr/src/cmd/halt/smf/boot-config.xml => usr/src/cmd/halt/smf.i386/boot-config.xml
rename : usr/src/cmd/halt/smf/svc-boot-config => usr/src/cmd/halt/smf.i386/svc-boot-config
rename : usr/src/cmd/halt/smf/Makefile => usr/src/cmd/halt/smf.sparc/Makefile
rename : usr/src/cmd/halt/smf/boot-config.xml => usr/src/cmd/halt/smf.sparc/boot-config.xml
rename : usr/src/cmd/halt/smf/svc-boot-config => usr/src/cmd/halt/smf.sparc/svc-boot-config
Diffstat (limited to 'usr/src/lib')
| -rw-r--r-- | usr/src/lib/libscf/common/highlevel.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/src/lib/libscf/common/highlevel.c b/usr/src/lib/libscf/common/highlevel.c index e31c2ece5c..d5ab524d0c 100644 --- a/usr/src/lib/libscf/common/highlevel.c +++ b/usr/src/lib/libscf/common/highlevel.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Copyright 2010 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -162,9 +162,6 @@ scf_get_boot_config(uint8_t *boot_config) assert(boot_config); *boot_config = 0; -#ifndef __x86 - return; -#else { /* * Property vector for BOOT_CONFIG_PG_PARAMS property group. @@ -183,6 +180,8 @@ scf_get_boot_config(uint8_t *boot_config) prop = NULL; if (scf_read_propvec(FMRI_BOOT_CONFIG, BOOT_CONFIG_PG_PARAMS, B_TRUE, ua_boot_config, &prop) != SCF_FAILED) { + +#ifdef __x86 /* * Unset both flags if the platform has been * blacklisted. @@ -190,6 +189,7 @@ scf_get_boot_config(uint8_t *boot_config) if (scf_is_fb_blacklisted()) *boot_config &= ~(UA_FASTREBOOT_DEFAULT | UA_FASTREBOOT_ONPANIC); +#endif /* __x86 */ return; } #if defined(FASTREBOOT_DEBUG) @@ -204,7 +204,6 @@ scf_get_boot_config(uint8_t *boot_config) } #endif /* FASTREBOOT_DEBUG */ } -#endif /* __x86 */ } /* |