[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-23ec13ebc0426fc5f3ecc623c432d57f919e1b28@git.kernel.org>
Date: Mon, 16 Mar 2015 05:10:07 -0700
From: tip-bot for Denys Vlasenko <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: bp@...en8.de, ast@...mgrid.com, keescook@...omium.org,
wad@...omium.org, rostedt@...dmis.org, luto@...capital.net,
linux-kernel@...r.kernel.org, tglx@...utronix.de, hpa@...or.com,
mingo@...nel.org, torvalds@...ux-foundation.org,
dvlasenk@...hat.com, oleg@...hat.com, fweisbec@...il.com
Subject: [tip:x86/asm] include/stddef.h: Move offsetofend()
from vfio.h to a generic kernel header
Commit-ID: 23ec13ebc0426fc5f3ecc623c432d57f919e1b28
Gitweb: http://git.kernel.org/tip/23ec13ebc0426fc5f3ecc623c432d57f919e1b28
Author: Denys Vlasenko <dvlasenk@...hat.com>
AuthorDate: Mon, 9 Mar 2015 15:52:17 +0100
Committer: Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 16 Mar 2015 11:05:37 +0100
include/stddef.h: Move offsetofend() from vfio.h to a generic kernel header
Suggested by Andy.
Suggested-by: Andy Lutomirski <luto@...capital.net>
Signed-off-by: Denys Vlasenko <dvlasenk@...hat.com>
Acked-by: Linus Torvalds <torvalds@...ux-foundation.org>
Cc: Alexei Starovoitov <ast@...mgrid.com>
Cc: Borislav Petkov <bp@...en8.de>
Cc: Frederic Weisbecker <fweisbec@...il.com>
Cc: H. Peter Anvin <hpa@...or.com>
Cc: Kees Cook <keescook@...omium.org>
Cc: Oleg Nesterov <oleg@...hat.com>
Cc: Steven Rostedt <rostedt@...dmis.org>
Cc: Will Drewry <wad@...omium.org>
Link: http://lkml.kernel.org/r/1425912738-559-1-git-send-email-dvlasenk@redhat.com
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
include/linux/stddef.h | 9 +++++++++
include/linux/vfio.h | 13 -------------
2 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/include/linux/stddef.h b/include/linux/stddef.h
index f4aec0e..076af43 100644
--- a/include/linux/stddef.h
+++ b/include/linux/stddef.h
@@ -19,3 +19,12 @@ enum {
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
#endif
#endif
+
+/**
+ * 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))
diff --git a/include/linux/vfio.h b/include/linux/vfio.h
index 2d67b89..049b2f4 100644
--- a/include/linux/vfio.h
+++ b/include/linux/vfio.h
@@ -78,19 +78,6 @@ extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);
extern void vfio_unregister_iommu_driver(
const struct vfio_iommu_driver_ops *ops);
-/**
- * offsetofend(TYPE, MEMBER)
- *
- * @TYPE: The type of the structure
- * @MEMBER: The member within the structure to get the end offset of
- *
- * Simple helper macro for dealing with variable sized structures passed
- * from user space. This allows us to easily determine if the provided
- * structure is sized to include various fields.
- */
-#define offsetofend(TYPE, MEMBER) \
- (offsetof(TYPE, MEMBER) + sizeof(((TYPE *)0)->MEMBER))
-
/*
* External user API
*/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists