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

[Hans Petter Selasky]

Author: hselasky
Date: Mon May 18 08:55:49 2020
New Revision: 361162
URL: https://svnweb.freebsd.org/changeset/base/361162

Log:
  MFC r360115:
  Allow the ERR_CAST() function in the LinuxKPI to take a const void pointer.
  No functional change.
  
  Sponsored by:	Mellanox Technologies

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

Modified: stable/12/sys/compat/linuxkpi/common/include/linux/err.h
==============================================================================
--- stable/12/sys/compat/linuxkpi/common/include/linux/err.h	Mon May 18 08:52:40 2020	(r361161)
+++ stable/12/sys/compat/linuxkpi/common/include/linux/err.h	Mon May 18 08:55:49 2020	(r361162)
@@ -31,6 +31,8 @@
 #ifndef	_LINUX_ERR_H_
 #define	_LINUX_ERR_H_
 
+#include <sys/types.h>
+
 #include <linux/compiler.h>
 
 #define MAX_ERRNO	4095
@@ -62,9 +64,9 @@ IS_ERR_OR_NULL(const void *ptr)
 }
 
 static inline void *
-ERR_CAST(void *ptr)
+ERR_CAST(const void *ptr)
 {
-	return (void *)ptr;
+	return __DECONST(void *, ptr);
 }
 
 static inline int