Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38764884 authored by Denys Vlasenko's avatar Denys Vlasenko Committed by Ingo Molnar
Browse files

include/stddef.h: Move offsetofend() from vfio.h to a generic kernel header 



Suggested by Andy.

Suggested-by: default avatarAndy Lutomirski <luto@amacapital.net>
Signed-off-by: default avatarDenys Vlasenko <dvlasenk@redhat.com>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Cc: Alexei Starovoitov <ast@plumgrid.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Will Drewry <wad@chromium.org>
Link: http://lkml.kernel.org/r/1425912738-559-1-git-send-email-dvlasenk@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5c39403e

include/linux/stddef.h

+9 −0
Original line number Diff line number Diff line
@@ -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))

include/linux/vfio.h

+0 −13
Original line number Diff line number Diff line
@@ -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

 */