diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-11 13:13:38 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-03-11 13:13:38 +0000 |
commit | cbabb52cbef55dc12ac62bb5e5da7cc02cf114d2 (patch) | |
tree | 9b95d76ec1eaca7a5112c582f7f176891a918e1c /usr/src/cmd/ucodeadm/ucodeadm.c | |
parent | e790b92538e616017d45a87be045bccb1a3c8758 (diff) | |
parent | 36ac8d7d925ed80286cf13327142ca1fa6943fc3 (diff) | |
download | illumos-joyent-cbabb52cbef55dc12ac62bb5e5da7cc02cf114d2.tar.gz |
[illumos-gate merge]
commit 36ac8d7d925ed80286cf13327142ca1fa6943fc3
10119 audit(1) gets NULL check wrong
commit dbef1f18aebff7758796283d40875419be721c2b
10510 loader: bios comc_probe() is out of sync with uefi version
commit 7b38fab6300e0a1599b9741cfeafd94d362b87aa
9433 Fix ARC hit rate
commit bc54f855e0de1e590115101c80f152a20722cfb0
10120 smatch indenting fixes for usr/src/cmd
Diffstat (limited to 'usr/src/cmd/ucodeadm/ucodeadm.c')
-rw-r--r-- | usr/src/cmd/ucodeadm/ucodeadm.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/usr/src/cmd/ucodeadm/ucodeadm.c b/usr/src/cmd/ucodeadm/ucodeadm.c index 1ff85bcf0d..67a7bae882 100644 --- a/usr/src/cmd/ucodeadm/ucodeadm.c +++ b/usr/src/cmd/ucodeadm/ucodeadm.c @@ -23,6 +23,10 @@ * Use is subject to license terms. */ +/* + * Copyright (c) 2018, Joyent, Inc. + */ + #include <sys/types.h> #include <sys/processor.h> #include <sys/ucode.h> @@ -668,9 +672,9 @@ main(int argc, char *argv[]) uint32_t *revp = NULL; int i; #if defined(_SYSCALL32_IMPL) - struct ucode_get_rev_struct32 inf32; + struct ucode_get_rev_struct32 inf32; #else - struct ucode_get_rev_struct info; + struct ucode_get_rev_struct info; #endif cpuid_max = (processorid_t)sysconf(_SC_CPUID_MAX); @@ -721,9 +725,9 @@ main(int argc, char *argv[]) if (action & UCODE_OPT_UPDATE) { int tmprc; #if defined(_SYSCALL32_IMPL) - struct ucode_write_struct32 uw_struct32; + struct ucode_write_struct32 uw_struct32; #else - struct ucode_write_struct uw_struct; + struct ucode_write_struct uw_struct; #endif #if defined(_SYSCALL32_IMPL) |