From d053391cd70d5a75b951c9d348c6f9b863ae168a Mon Sep 17 00:00:00 2001 From: Hans Petter Selasky Date: Tue, 2 Jun 2020 12:23:04 +0000 Subject: [PATCH] Implement __is_constexpr() function macro in the LinuxKPI. Bump the FreeBSD version. MFC after: 1 week Sponsored by: Mellanox Technologies --- sys/compat/linuxkpi/common/include/linux/kernel.h | 3 +++ sys/sys/param.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/kernel.h b/sys/compat/linuxkpi/common/include/linux/kernel.h index e65cf9ad607..a96ab4babe4 100644 --- a/sys/compat/linuxkpi/common/include/linux/kernel.h +++ b/sys/compat/linuxkpi/common/include/linux/kernel.h @@ -561,4 +561,7 @@ linux_ratelimited(linux_ratelimit_t *rl) ((num) > __max) ? SIZE_MAX : (__size + sizeof((ptr)->field[0]) * (num)); \ }) +#define __is_constexpr(x) \ + __builtin_constant_p(x) + #endif /* _LINUX_KERNEL_H_ */ diff --git a/sys/sys/param.h b/sys/sys/param.h index ac13e42fe55..6a38ca82d04 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -60,7 +60,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1300096 /* Master, propagated to newvers */ +#define __FreeBSD_version 1300097 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,