diff options
| author | Brian Behlendorf <behlendorf1@llnl.gov> | 2021-07-27 00:31:00 +0000 |
|---|---|---|
| committer | Brian Behlendorf <behlendorf1@llnl.gov> | 2021-07-27 16:49:11 +0000 |
| commit | 4bd99c11d76bec08c951f3fc491a92e8e24de361 (patch) | |
| tree | bda63ae204bc5926e94c621d09dcf154620af8a8 | |
| parent | 9776838cfb8c72b2d9bd340db6caf44a95ec580b (diff) | |
| download | src-4bd99c11d76bec08c951f3fc491a92e8e24de361.tar.gz src-4bd99c11d76bec08c951f3fc491a92e8e24de361.zip | |
Remove overlooked __sun_attr__ based macros
The __NORETURN, __CONST, and __PURE macros in the FreeBSD platform
code were based on the __sun_attr__ macro which was removed in
commit 5dbf6c5a6. This caused a build failure because the
__NORETURN macro was still used in one place in kernel code.
The __CONST and __PURE macros were entirely unused.
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #12435
| -rw-r--r-- | include/os/freebsd/spl/sys/ccompile.h | 6 | ||||
| -rw-r--r-- | include/os/freebsd/spl/sys/cmn_err.h | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/include/os/freebsd/spl/sys/ccompile.h b/include/os/freebsd/spl/sys/ccompile.h index 9970443103bf..23e637983475 100644 --- a/include/os/freebsd/spl/sys/ccompile.h +++ b/include/os/freebsd/spl/sys/ccompile.h @@ -36,12 +36,6 @@ extern "C" { #endif -#if defined(_KERNEL) || defined(_STANDALONE) -#define __NORETURN __sun_attr__((__noreturn__)) -#endif /* _KERNEL || _STANDALONE */ -#define __CONST __sun_attr__((__const__)) -#define __PURE __sun_attr__((__pure__)) - #if defined(INVARIANTS) && !defined(ZFS_DEBUG) #define ZFS_DEBUG #undef NDEBUG diff --git a/include/os/freebsd/spl/sys/cmn_err.h b/include/os/freebsd/spl/sys/cmn_err.h index bf41ecdb286d..ddc2f0049e59 100644 --- a/include/os/freebsd/spl/sys/cmn_err.h +++ b/include/os/freebsd/spl/sys/cmn_err.h @@ -71,7 +71,7 @@ extern void vuprintf(const char *, __va_list) __attribute__((format(printf, 1, 0))); extern void panic(const char *, ...) - __attribute__((format(printf, 1, 2))) __NORETURN; + __attribute__((format(printf, 1, 2))); #endif /* !_ASM */ |