lkml.org 
[lkml]   [2012]   [Apr]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/urgent] x32, siginfo: Provide proper overrides for x32 siginfo_t
    Commit-ID:  045b09a0be388ece1469aa02f17252e57c95093e
    Gitweb: http://git.kernel.org/tip/045b09a0be388ece1469aa02f17252e57c95093e
    Author: H. Peter Anvin <hpa@linux.intel.com>
    AuthorDate: Mon, 23 Apr 2012 16:34:12 -0700
    Committer: H. Peter Anvin <hpa@linux.intel.com>
    CommitDate: Mon, 23 Apr 2012 16:36:45 -0700

    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.

    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>
    ---
    arch/x86/include/asm/siginfo.h | 8 +++++++-
    1 files changed, 7 insertions(+), 1 deletions(-)

    diff --git a/arch/x86/include/asm/siginfo.h b/arch/x86/include/asm/siginfo.h
    index fc1aa55..073d445 100644
    --- a/arch/x86/include/asm/siginfo.h
    +++ b/arch/x86/include/asm/siginfo.h
    @@ -2,7 +2,13 @@
    #define _ASM_X86_SIGINFO_H

    #ifdef __x86_64__
    -# define __ARCH_SI_PREAMBLE_SIZE (4 * sizeof(int))
    +# 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>
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2012-04-24 01:53    [W:0.028 / U:32.916 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site