nlm: Ensure callback code also checks that the files match

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / include / linux / stddef.h

diff --git a/include/linux/stddef.h b/include/linux/stddef.h
index 1747b6787b9e90375827a9af75148bf420caf386..9c61c7cda9363360595dee03ffe787b81f6c2919 100644 (file)
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
@@ -1,9 +1,7 @@
 #ifndef _LINUX_STDDEF_H
 #define _LINUX_STDDEF_H
 
-#include <linux/compiler.h>
-
-#ifdef __KERNEL__
+#include <uapi/linux/stddef.h>
 
 #undef NULL
 #define NULL ((void *)0)
@@ -15,10 +13,18 @@ enum {
 
 #undef offsetof
 #ifdef __compiler_offsetof
-#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
+#define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER)
 #else
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#define offsetof(TYPE, MEMBER) ((size_t)&((TYPE *)0)->MEMBER)
 #endif
-#endif /* __KERNEL__ */
+
+/**
+ * offsetofend(TYPE, MEMBER)
+ *
+ * @TYPE: The type of the structure
+ * @MEMBER: The member within the structure to get the end offset of
+ */
+#define offsetofend(TYPE, MEMBER) \
+       (offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER))
 
 #endif