diff options
| author | Mark Johnston <markj@FreeBSD.org> | 2017-11-21 14:59:23 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2017-11-21 14:59:23 +0000 |
| commit | 755230eb9f87f66fd4bd20862e73bad612e36199 (patch) | |
| tree | ee9c735acaf1618e6019f215d9f0608a7ea8f182 /sys/sys/rmlock.h | |
| parent | 2b378326f89d75b9612cc912f7fa2257cca9a97f (diff) | |
| download | src-755230eb9f87f66fd4bd20862e73bad612e36199.tar.gz src-755230eb9f87f66fd4bd20862e73bad612e36199.zip | |
Notes
Diffstat (limited to 'sys/sys/rmlock.h')
| -rw-r--r-- | sys/sys/rmlock.h | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/sys/sys/rmlock.h b/sys/sys/rmlock.h index b065df42b6f4..da5d7274e780 100644 --- a/sys/sys/rmlock.h +++ b/sys/sys/rmlock.h @@ -103,35 +103,21 @@ void _rm_assert(const struct rmlock *rm, int what, const char *file, struct rm_args { struct rmlock *ra_rm; const char *ra_desc; + int ra_flags; }; -struct rm_args_flags { - struct rmlock *ra_rm; - const char *ra_desc; - int ra_opts; -}; - -#define RM_SYSINIT(name, rm, desc) \ +#define RM_SYSINIT_FLAGS(name, rm, desc, flags) \ static struct rm_args name##_args = { \ (rm), \ (desc), \ + (flags), \ }; \ SYSINIT(name##_rm_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \ rm_sysinit, &name##_args); \ SYSUNINIT(name##_rm_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \ rm_destroy, (rm)) - -#define RM_SYSINIT_FLAGS(name, rm, desc, opts) \ - static struct rm_args name##_args = { \ - (rm), \ - (desc), \ - (opts), \ - }; \ - SYSINIT(name##_rm_sysinit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \ - rm_sysinit_flags, &name##_args); \ - SYSUNINIT(name##_rm_sysuninit, SI_SUB_LOCK, SI_ORDER_MIDDLE, \ - rm_destroy, (rm)) +#define RM_SYSINIT(name, rm, desc) RM_SYSINIT_FLAGS(name, rm, desc, 0) #if defined(INVARIANTS) || defined(INVARIANT_SUPPORT) #define RA_LOCKED LA_LOCKED |