lkml.org 
[lkml]   [2015]   [Jul]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/asm] x86/compat: Move ucontext_x32 to sigframe.h
    Commit-ID:  b829d1be20ab51a3b76ec003118c9260d1fa424e
    Gitweb: http://git.kernel.org/tip/b829d1be20ab51a3b76ec003118c9260d1fa424e
    Author: Brian Gerst <brgerst@gmail.com>
    AuthorDate: Mon, 22 Jun 2015 07:55:12 -0400
    Committer: Ingo Molnar <mingo@kernel.org>
    CommitDate: Mon, 6 Jul 2015 15:28:55 +0200

    x86/compat: Move ucontext_x32 to sigframe.h

    ia32.h should only contain the code for 32-bit compatability.

    Signed-off-by: Brian Gerst <brgerst@gmail.com>
    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Denys Vlasenko <dvlasenk@redhat.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Link: http://lkml.kernel.org/r/1434974121-32575-4-git-send-email-brgerst@gmail.com
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/include/asm/ia32.h | 9 ---------
    arch/x86/include/asm/sigframe.h | 10 ++++++++++
    2 files changed, 10 insertions(+), 9 deletions(-)

    diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
    index d0e8e01..2801976 100644
    --- a/arch/x86/include/asm/ia32.h
    +++ b/arch/x86/include/asm/ia32.h
    @@ -22,15 +22,6 @@ struct ucontext_ia32 {
    compat_sigset_t uc_sigmask; /* mask last for extensibility */
    };

    -struct ucontext_x32 {
    - unsigned int uc_flags;
    - unsigned int uc_link;
    - compat_stack_t uc_stack;
    - unsigned int uc__pad0; /* needed for alignment */
    - struct sigcontext uc_mcontext; /* the 64-bit sigcontext type */
    - compat_sigset_t uc_sigmask; /* mask last for extensibility */
    -};
    -
    /* This matches struct stat64 in glibc2.2, hence the absolutely
    * insane amounts of padding around dev_t's.
    */
    diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h
    index 7c7c27c..1f3175b 100644
    --- a/arch/x86/include/asm/sigframe.h
    +++ b/arch/x86/include/asm/sigframe.h
    @@ -4,6 +4,7 @@
    #include <asm/sigcontext.h>
    #include <asm/siginfo.h>
    #include <asm/ucontext.h>
    +#include <linux/compat.h>

    #ifdef CONFIG_X86_32
    #define sigframe_ia32 sigframe
    @@ -69,6 +70,15 @@ struct rt_sigframe {

    #ifdef CONFIG_X86_X32_ABI

    +struct ucontext_x32 {
    + unsigned int uc_flags;
    + unsigned int uc_link;
    + compat_stack_t uc_stack;
    + unsigned int uc__pad0; /* needed for alignment */
    + struct sigcontext uc_mcontext; /* the 64-bit sigcontext type */
    + compat_sigset_t uc_sigmask; /* mask last for extensibility */
    +};
    +
    struct rt_sigframe_x32 {
    u64 pretcode;
    struct ucontext_x32 uc;

    \
     
     \ /
      Last update: 2015-07-06 18:01    [W:4.108 / U:1.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site