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

[firefly-linux-kernel-4.4.55.git] / include / asm-x86 / asm.h

diff --git a/include/asm-x86/asm.h b/include/asm-x86/asm.h
index 8661ae75488a59277e6f0b5b814fe40692fc3823..90dec0c236469455821607eca77a5a86684af6d2 100644 (file)
--- a/include/asm-x86/asm.h
+++ b/include/asm-x86/asm.h
@@ -8,6 +8,12 @@
 # define _ASM_ALIGN    " .balign 4 "
 # define _ASM_MOV_UL   " movl "
 
+# define _ASM_INC      " incl "
+# define _ASM_DEC      " decl "
+# define _ASM_ADD      " addl "
+# define _ASM_SUB      " subl "
+# define _ASM_XADD     " xaddl "
+
 #else
 /* 64 bits */
 
@@ -15,6 +21,19 @@
 # define _ASM_ALIGN    " .balign 8 "
 # define _ASM_MOV_UL   " movq "
 
+# define _ASM_INC      " incq "
+# define _ASM_DEC      " decq "
+# define _ASM_ADD      " addq "
+# define _ASM_SUB      " subq "
+# define _ASM_XADD     " xaddq "
+
 #endif /* CONFIG_X86_32 */
 
+/* Exception table entry */
+# define _ASM_EXTABLE(from,to) \
+       " .section __ex_table,\"a\"\n" \
+       _ASM_ALIGN "\n" \
+       _ASM_PTR #from "," #to "\n" \
+       " .previous\n"
+
 #endif /* _ASM_X86_ASM_H */