Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 cleanups from Peter Anvin:
 "The biggest textual change is the cleanup to use symbolic constants
  for x86 trap values.

  The only *functional* change and the reason for the x86/x32 dependency
  is the move of is_ia32_task() into <asm/thread_info.h> so that it can
  be used in other code that needs to understand if a system call comes
  from the compat entry point (and therefore uses i386 system call
  numbers) or not.  One intended user for that is the BPF system call
  filter.  Moving it out of <asm/compat.h> means we can define it
  unconditionally, returning always true on i386."

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: Move is_ia32_task to asm/thread_info.h from asm/compat.h
  x86: Rename trap_no to trap_nr in thread_struct
  x86: Use enum instead of literals for trap values

4 files changed, 38 insertions, 10 deletions

diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
index 355edc091604..d6805798d6fc 100644
--- a/arch/x86/include/asm/compat.h
+++ b/arch/x86/include/asm/compat.h
@@ -235,15 +235,6 @@ static inline void __user *arch_compat_alloc_user_space(long len)
         return (void __user *)round_down(sp - len, 16);
 }
 
-static inline bool is_ia32_task(void)
-{
-#ifdef CONFIG_IA32_EMULATION
-        if (current_thread_info()->status & TS_COMPAT)
-                return true;
-#endif
-        return false;
-}
-
 static inline bool is_x32_task(void)
 {
 #ifdef CONFIG_X86_X32_ABI
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index f302ef6bb200..7284c9a6a0b5 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -463,7 +463,7 @@ struct thread_struct {
         unsigned long           ptrace_dr7;
         /* Fault info: */
         unsigned long           cr2;
-        unsigned long           trap_no;
+        unsigned long           trap_nr;
         unsigned long           error_code;
         /* floating point and extended processor state */
         struct fpu              fpu;
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
index af1db7e722f4..ad6df8ccd715 100644
--- a/arch/x86/include/asm/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
@@ -266,6 +266,18 @@ static inline void set_restore_sigmask(void)
         ti->status |= TS_RESTORE_SIGMASK;
         set_bit(TIF_SIGPENDING, (unsigned long *)&ti->flags);
 }
+
+static inline bool is_ia32_task(void)
+{
+#ifdef CONFIG_X86_32
+        return true;
+#endif
+#ifdef CONFIG_IA32_EMULATION
+        if (current_thread_info()->status & TS_COMPAT)
+                return true;
+#endif
+        return false;
+}
 #endif  /* !__ASSEMBLY__ */
 
 #ifndef __ASSEMBLY__
diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
index 0012d0902c5f..88eae2aec619 100644
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.h
@@ -89,4 +89,29 @@ asmlinkage void smp_thermal_interrupt(void);
 asmlinkage void mce_threshold_interrupt(void);
 #endif
 
+/* Interrupts/Exceptions */
+enum {
+        X86_TRAP_DE = 0,        /*  0, Divide-by-zero */
+        X86_TRAP_DB,            /*  1, Debug */
+        X86_TRAP_NMI,           /*  2, Non-maskable Interrupt */
+        X86_TRAP_BP,            /*  3, Breakpoint */
+        X86_TRAP_OF,            /*  4, Overflow */
+        X86_TRAP_BR,            /*  5, Bound Range Exceeded */
+        X86_TRAP_UD,            /*  6, Invalid Opcode */
+        X86_TRAP_NM,            /*  7, Device Not Available */
+        X86_TRAP_DF,            /*  8, Double Fault */
+        X86_TRAP_OLD_MF,        /*  9, Coprocessor Segment Overrun */
+        X86_TRAP_TS,            /* 10, Invalid TSS */
+        X86_TRAP_NP,            /* 11, Segment Not Present */
+        X86_TRAP_SS,            /* 12, Stack Segment Fault */
+        X86_TRAP_GP,            /* 13, General Protection Fault */
+        X86_TRAP_PF,            /* 14, Page Fault */
+        X86_TRAP_SPURIOUS,      /* 15, Spurious Interrupt */
+        X86_TRAP_MF,            /* 16, x87 Floating-Point Exception */
+        X86_TRAP_AC,            /* 17, Alignment Check */
+        X86_TRAP_MC,            /* 18, Machine Check */
+        X86_TRAP_XF,            /* 19, SIMD Floating-Point Exception */
+        X86_TRAP_IRET = 32,     /* 32, IRET Exception */
+};
+
 #endif /* _ASM_X86_TRAPS_H */