lkml.org 
[lkml]   [2015]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/15] x86/headers: Remove <asm/sigcontext.h>
    Date
    Now that all type definitions are in the UAPI header, remove the <asm/sigcontext.h> wrapper.

    Cc: Andy Lutomirski <luto@amacapital.net>
    Cc: Borislav Petkov <bp@alien8.de>
    Cc: Brian Gerst <brgerst@gmail.com>
    Cc: Denys Vlasenko <dvlasenk@redhat.com>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Linus Torvalds <torvalds@linux-foundation.org>
    Cc: Mikko Rapeli <mikko.rapeli@iki.fi>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Ingo Molnar <mingo@kernel.org>
    ---
    arch/x86/ia32/ia32_signal.c | 2 +-
    arch/x86/include/asm/fpu/signal.h | 2 +-
    arch/x86/include/asm/ia32.h | 2 +-
    arch/x86/include/asm/processor.h | 2 +-
    arch/x86/include/asm/sigcontext.h | 6 ------
    arch/x86/include/asm/sigframe.h | 2 +-
    arch/x86/include/asm/signal.h | 2 +-
    arch/x86/include/uapi/asm/sigcontext32.h | 2 +-
    arch/x86/math-emu/fpu_emu.h | 2 +-
    9 files changed, 8 insertions(+), 14 deletions(-)

    diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
    index f49a4426ad1c..a5d32937acfd 100644
    --- a/arch/x86/ia32/ia32_signal.c
    +++ b/arch/x86/ia32/ia32_signal.c
    @@ -26,7 +26,7 @@
    #include <asm/ptrace.h>
    #include <asm/ia32_unistd.h>
    #include <asm/user32.h>
    -#include <asm/sigcontext.h>
    +#include <uapi/asm/sigcontext.h>
    #include <asm/proto.h>
    #include <asm/vdso.h>
    #include <asm/sigframe.h>
    diff --git a/arch/x86/include/asm/fpu/signal.h b/arch/x86/include/asm/fpu/signal.h
    index 856f4b3cf1e3..0e970d00dfcd 100644
    --- a/arch/x86/include/asm/fpu/signal.h
    +++ b/arch/x86/include/asm/fpu/signal.h
    @@ -5,7 +5,7 @@
    #define _ASM_X86_FPU_SIGNAL_H

    #ifdef CONFIG_X86_64
    -# include <asm/sigcontext.h>
    +# include <uapi/asm/sigcontext.h>
    # include <asm/user32.h>
    struct ksignal;
    int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
    diff --git a/arch/x86/include/asm/ia32.h b/arch/x86/include/asm/ia32.h
    index b47312447786..fee07c70773a 100644
    --- a/arch/x86/include/asm/ia32.h
    +++ b/arch/x86/include/asm/ia32.h
    @@ -10,7 +10,7 @@
    * 32 bit structures for IA32 support.
    */

    -#include <asm/sigcontext.h>
    +#include <uapi/asm/sigcontext.h>

    /* signal.h */

    diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
    index 944f1785ed0d..3fded5308f29 100644
    --- a/arch/x86/include/asm/processor.h
    +++ b/arch/x86/include/asm/processor.h
    @@ -11,7 +11,7 @@ struct mm_struct;
    #include <asm/math_emu.h>
    #include <asm/segment.h>
    #include <asm/types.h>
    -#include <asm/sigcontext.h>
    +#include <uapi/asm/sigcontext.h>
    #include <asm/current.h>
    #include <asm/cpufeature.h>
    #include <asm/page.h>
    diff --git a/arch/x86/include/asm/sigcontext.h b/arch/x86/include/asm/sigcontext.h
    deleted file mode 100644
    index 25815f00b4ff..000000000000
    --- a/arch/x86/include/asm/sigcontext.h
    +++ /dev/null
    @@ -1,6 +0,0 @@
    -#ifndef _ASM_X86_SIGCONTEXT_H
    -#define _ASM_X86_SIGCONTEXT_H
    -
    -#include <uapi/asm/sigcontext.h>
    -
    -#endif /* _ASM_X86_SIGCONTEXT_H */
    diff --git a/arch/x86/include/asm/sigframe.h b/arch/x86/include/asm/sigframe.h
    index cb8f917248cb..1adf8821bd5c 100644
    --- a/arch/x86/include/asm/sigframe.h
    +++ b/arch/x86/include/asm/sigframe.h
    @@ -1,7 +1,7 @@
    #ifndef _ASM_X86_SIGFRAME_H
    #define _ASM_X86_SIGFRAME_H

    -#include <asm/sigcontext.h>
    +#include <uapi/asm/sigcontext.h>
    #include <asm/siginfo.h>
    #include <asm/ucontext.h>

    diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
    index 31eab867e6d3..2002c2e07649 100644
    --- a/arch/x86/include/asm/signal.h
    +++ b/arch/x86/include/asm/signal.h
    @@ -34,7 +34,7 @@ extern void do_notify_resume(struct pt_regs *, void *, __u32);

    #define __ARCH_HAS_SA_RESTORER

    -#include <asm/sigcontext.h>
    +#include <uapi/asm/sigcontext.h>

    #ifdef __i386__

    diff --git a/arch/x86/include/uapi/asm/sigcontext32.h b/arch/x86/include/uapi/asm/sigcontext32.h
    index a92b0f0dc09e..8b870175befa 100644
    --- a/arch/x86/include/uapi/asm/sigcontext32.h
    +++ b/arch/x86/include/uapi/asm/sigcontext32.h
    @@ -3,6 +3,6 @@

    /* This is a legacy file - all the type definitions are in sigcontext.h: */

    -#include <asm/sigcontext.h>
    +#include <uapi/asm/sigcontext.h>

    #endif /* _ASM_X86_SIGCONTEXT32_H */
    diff --git a/arch/x86/math-emu/fpu_emu.h b/arch/x86/math-emu/fpu_emu.h
    index 4dae511c85ad..afbc4d805d66 100644
    --- a/arch/x86/math-emu/fpu_emu.h
    +++ b/arch/x86/math-emu/fpu_emu.h
    @@ -71,7 +71,7 @@

    #include "fpu_system.h"

    -#include <asm/sigcontext.h> /* for struct _fpstate */
    +#include <uapi/asm/sigcontext.h> /* for struct _fpstate */
    #include <asm/math_emu.h>
    #include <linux/linkage.h>

    --
    2.1.4


    \
     
     \ /
      Last update: 2015-09-05 09:41    [W:4.047 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site