diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-05-18 09:35:46 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-10-20 14:59:55 +0200 |
| commit | 62c8ca0ead09ef289faf6517e177fd6f6d7a74a3 (patch) | |
| tree | 8eeed454171864eb40485c13f004b39150704135 /freebsd/sys/sys | |
| parent | Add CPUINFO command to default network init (diff) | |
| download | rtems-libbsd-62c8ca0ead09ef289faf6517e177fd6f6d7a74a3.tar.bz2 | |
Fix INVARIANTS support
Diffstat (limited to 'freebsd/sys/sys')
| -rw-r--r-- | freebsd/sys/sys/rmlock.h | 1 | ||||
| -rw-r--r-- | freebsd/sys/sys/rwlock.h | 4 | ||||
| -rw-r--r-- | freebsd/sys/sys/systm.h | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/freebsd/sys/sys/rmlock.h b/freebsd/sys/sys/rmlock.h index efd60597..c14dcb15 100644 --- a/freebsd/sys/sys/rmlock.h +++ b/freebsd/sys/sys/rmlock.h @@ -112,6 +112,7 @@ void _rm_assert(const struct rmlock *rm, int what, const char *file, #define rm_rlock(rm, tracker) do { (void)tracker; rw_rlock(rm); } while (0) #define rm_runlock(rm, tracker) do { (void)tracker; rw_runlock(rm); } while (0) #define rm_sleep rw_sleep +#define _rm_assert _rw_assert #endif /* __rtems__ */ diff --git a/freebsd/sys/sys/rwlock.h b/freebsd/sys/sys/rwlock.h index 8988ecbd..8c1f8e6d 100644 --- a/freebsd/sys/sys/rwlock.h +++ b/freebsd/sys/sys/rwlock.h @@ -164,6 +164,10 @@ int _rw_try_rlock(struct rwlock *rw, const char *file, int line); void _rw_runlock(struct rwlock *rw, const char *file, int line); int _rw_try_upgrade(struct rwlock *rw, const char *file, int line); void _rw_downgrade(struct rwlock *rw, const char *file, int line); +#if defined(INVARIANTS) || defined(INVARIANT_SUPPORT) +void _rw_assert(const struct rwlock *rw, int what, const char *file, + int line); +#endif #endif /* __rtems__ */ #ifndef __rtems__ diff --git a/freebsd/sys/sys/systm.h b/freebsd/sys/sys/systm.h index 90c11bb1..6b557c56 100644 --- a/freebsd/sys/sys/systm.h +++ b/freebsd/sys/sys/systm.h @@ -105,7 +105,11 @@ enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV, VM_GUEST_VMWARE, VM_GUEST_KVM, VM_LAST }; #if defined(WITNESS) || defined(INVARIANT_SUPPORT) +#ifndef __rtems__ void kassert_panic(const char *fmt, ...) __printflike(1, 2); +#else /* __rtems__ */ +#define kassert_panic panic +#endif /* __rtems__ */ #endif #ifdef INVARIANTS /* The option is always available */ |