Commit 89b8835e authored Apr 23, 2012 by H. Peter Anvin Committed by H. Peter Anvin Apr 23, 2012

x32, siginfo: Provide proper overrides for x32 siginfo_t



Provide the proper override macros for x32 siginfo_t.  The combination
of a special type here and an overall alignment constraint actually
ends up with all the types being properly aligned, but the hack is
needed to keep the substructures inside siginfo_t from adding padding.

Note: use __attribute__((aligned())) since __aligned() is not exported
to user space.

[ v2: fix stray semicolon ]

Reported-by: H.J. Lu <hjl.rools@gmail.com>
Cc: Bruce J. Beare <bruce.j.beare@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Link: http://lkml.kernel.org/r/CAMe9rOqF6Kh6-NK7oP0Fpzkd4SBAWU%2BG53hwBbSD4iA2UzyxuA@mail.gmail.com


Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

parent d643bdca

arch/x86/include/asm/siginfo.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -2,8 +2,14 @@
		#define _ASM_X86_SIGINFO_H

		#ifdef __x86_64__
		# ifdef __ILP32__ /* x32 */
		typedef long long __kernel_si_clock_t __attribute__((aligned(4)));
		# define __ARCH_SI_CLOCK_T __kernel_si_clock_t
		# define __ARCH_SI_ATTRIBUTES __attribute__((aligned(8)))
		# else /* x86-64 */
		# define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
		# endif
		#endif

		#include <asm-generic/siginfo.h>