diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-01-27 10:08:32 -0500 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-01-27 10:08:34 -0500 |
| commit | c203af42e9e7d0f82694cadf8cf2473863df5b2b (patch) | |
| tree | 742053671ed177b7a404fce5dc85199c1fd24133 /usr/src/uts/common/sys/mhd.h | |
| parent | a930493fb800d3a82f5482ec0915801c26205ef3 (diff) | |
| parent | beed421eff10640141fe8f9da29a5c8033a97f52 (diff) | |
| download | illumos-joyent-release-20210128.tar.gz | |
[illumos-gate merge]release-20210128
commit beed421eff10640141fe8f9da29a5c8033a97f52
13383 generalize check for serializing LFENCE
13384 tsc_read() should use lfence when prudent
13387 bhyve should expose lfence serialize in DE_CFG MSR
commit 78801af7286cd73dbc996d470f789e75993cf15d
13365 Add option to testrunner to re-run just failed tests
commit 2d84dc94714fa18a51c85173f806acbc2d1b4257
13360 loader: use BGRA RBG data in gfx functions
commit a98e9e2e16f7c0305e8538246f8f8464517b3884
13432 idm: symbol 'idm' is multiply-defined
commit a35d0bb9919a1ab99b0305e759552bef6a8bd053
13431 rdsib: multiply-defined symbols
commit 245cbc655bd26e8de57809bc109b82105a30693d
13430 scsi_vhci: multiply-defined symbols
commit 9868091de5a69073a55e3b8cc1a378cac9220edf
13429 nge: multiply-defined symbols
commit 6626685934fc28e358a8038d599be9e53aa0715e
13428 rdsv3: symbol 'rdsv3_one_sec_in_hz' is multiply-defined
commit 734e1f66c3254ea498ea4ce3fe6dc7e6f9f293ff
13473 svccfg: dirs for manifests are manifest not manifests
commit 4f1c2d80debdaa7ad92b0677c6c86fb6b782e811
13425 i86xpv: multiply-defined symbols
Conflicts:
usr/src/test/zfs-tests/cmd/scripts/zfstest.ksh
Diffstat (limited to 'usr/src/uts/common/sys/mhd.h')
| -rw-r--r-- | usr/src/uts/common/sys/mhd.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/usr/src/uts/common/sys/mhd.h b/usr/src/uts/common/sys/mhd.h index 66d57266ad..3d7e0d5d5a 100644 --- a/usr/src/uts/common/sys/mhd.h +++ b/usr/src/uts/common/sys/mhd.h @@ -27,8 +27,6 @@ #ifndef _SYS_MHD_H #define _SYS_MHD_H -#pragma ident "%Z%%M% %I% %E% SMI" - #ifdef __cplusplus extern "C" { #endif @@ -41,8 +39,8 @@ extern "C" { #define MHIOCTKOWN (MHIOC|2) #define MHIOCRELEASE (MHIOC|3) #define MHIOCSTATUS (MHIOC|4) -#define MHIOCGRP_INKEYS (MHIOC|5) -#define MHIOCGRP_INRESV (MHIOC|6) +#define MHIOCGRP_INKEYS (MHIOC|5) +#define MHIOCGRP_INRESV (MHIOC|6) #define MHIOCGRP_REGISTER (MHIOC|7) #define MHIOCGRP_RESERVE (MHIOC|8) #define MHIOCGRP_PREEMPTANDABORT (MHIOC|9) @@ -79,13 +77,13 @@ typedef struct mhioc_inkeys { } mhioc_inkeys_t; #if defined(_SYSCALL32) -struct mhioc_key_list32 { +typedef struct mhioc_key_list32 { uint32_t listsize; uint32_t listlen; caddr32_t list; } mhioc_key_list32_t; -struct mhioc_inkeys32 { +typedef struct mhioc_inkeys32 { uint32_t generation; caddr32_t li; } mhioc_inkeys32_t; @@ -110,7 +108,7 @@ typedef struct mhioc_inresvs { } mhioc_inresvs_t; #if defined(_SYSCALL32) -struct mhioc_resv_desc_list32 { +typedef struct mhioc_resv_desc_list32 { uint32_t listsize; uint32_t listlen; caddr32_t list; |