diff options
| author | Sherry Moore <Sherry.Moore@Sun.COM> | 2009-09-16 09:51:25 -0700 |
|---|---|---|
| committer | Sherry Moore <Sherry.Moore@Sun.COM> | 2009-09-16 09:51:25 -0700 |
| commit | c90a5fbe436d54a1d69dbcf41c7f1cc7b2834a18 (patch) | |
| tree | cade078a60e6cd9bbc6958d07992a904b720f552 /usr/src/uts/common/syscall/uadmin.c | |
| parent | 33ce44c832cfc21f4711a1baa1015dcc840ad68f (diff) | |
| download | illumos-joyent-c90a5fbe436d54a1d69dbcf41c7f1cc7b2834a18.tar.gz | |
6880616 Need to provide interfaces for FMA to disable fast reboot on terminal errors
Diffstat (limited to 'usr/src/uts/common/syscall/uadmin.c')
| -rw-r--r-- | usr/src/uts/common/syscall/uadmin.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/usr/src/uts/common/syscall/uadmin.c b/usr/src/uts/common/syscall/uadmin.c index c86a64724d..a9aaff7892 100644 --- a/usr/src/uts/common/syscall/uadmin.c +++ b/usr/src/uts/common/syscall/uadmin.c @@ -307,11 +307,9 @@ kadmin(int cmd, int fcn, void *mdep, cred_t *credp) case AD_UPDATE_BOOT_CONFIG: #ifndef __sparc { - extern int fastreboot_capable; extern void fastboot_update_config(const char *); - if (fastreboot_capable) - fastboot_update_config(mdep); + fastboot_update_config(mdep); } #endif @@ -379,22 +377,9 @@ kadmin(int cmd, int fcn, void *mdep, cred_t *credp) panic_bootstr = mdep; #ifndef __sparc - extern int fastreboot_onpanic; - if (fcn != AD_FASTREBOOT) { - extern void fastboot_update_config(const char *); - /* - * If user has explicitly requested reboot to prom, - * or uadmin(1M) was invoked with other functions, - * don't try to fast reboot after dumping. - */ - fastreboot_onpanic = 0; - fastboot_update_config((char *)&fastreboot_onpanic); - } + extern void fastboot_update_and_load(int, char *); - if (fastreboot_onpanic) { - extern void fastboot_load_kernel(char *); - fastboot_load_kernel(mdep); - } + fastboot_update_and_load(fcn, mdep); #endif panic("forced crash dump initiated at user request"); |