svn commit: r362319 - in stable/12/sys: compat/linuxkpi/common/include/linux sys

[Hans Petter Selasky]

Author: hselasky
Date: Thu Jun 18 10:49:49 2020
New Revision: 362319
URL: https://svnweb.freebsd.org/changeset/base/362319

Log:
  MFC r361724:
  Implement __is_constexpr() function macro in the LinuxKPI.
  Bump the FreeBSD version.
  
  Sponsored by:	Mellanox Technologies

Modified:
  stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h
  stable/12/sys/sys/param.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h
==============================================================================
--- stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h	Thu Jun 18 10:48:37 2020	(r362318)
+++ stable/12/sys/compat/linuxkpi/common/include/linux/kernel.h	Thu Jun 18 10:49:49 2020	(r362319)
@@ -540,4 +540,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_ */

Modified: stable/12/sys/sys/param.h
==============================================================================
--- stable/12/sys/sys/param.h	Thu Jun 18 10:48:37 2020	(r362318)
+++ stable/12/sys/sys/param.h	Thu Jun 18 10:49:49 2020	(r362319)
@@ -60,7 +60,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1201517	/* Master, propagated to newvers */
+#define __FreeBSD_version 1201518	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,