summary refs log tree commit diff
path: root/arch/x86/include/asm/calling.h
diff options
context:
space:
mode:
authorBorislav Petkov <bp@alien8.de>2011-05-31 22:21:52 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2011-06-03 14:38:51 -0700
commitcac0e0a78f722abd85b7f8d614ee0820f7672f58 (patch)
treec76b60de050278abbc9efec9cd3dba57530153c3 /arch/x86/include/asm/calling.h
parenta268fcfaa6ab2ef740fda5ecf947aca45ccd535d (diff)
downloadlinux-cac0e0a78f722abd85b7f8d614ee0820f7672f58.tar.gz
x86, asm: Flip SAVE_ARGS arguments logic
This saves us the else part of the conditional statement in the macro.

No functionality change.

Signed-off-by: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/1306873314-32523-3-git-send-email-bp@alien8.de
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/calling.h')
-rw-r--r--arch/x86/include/asm/calling.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
index b67e06c4710e..b0b7d90d3054 100644
--- a/arch/x86/include/asm/calling.h
+++ b/arch/x86/include/asm/calling.h
@@ -85,22 +85,20 @@ For 32-bit we have the following conventions - kernel is built with
 #define ARGOFFSET	R11
 #define SWFRAME		ORIG_RAX
 
-	.macro SAVE_ARGS addskip=0, norcx=0, nor891011=0
+	.macro SAVE_ARGS addskip=0, save_rcx=1, save_r891011=1
 	subq  $9*8+\addskip, %rsp
 	CFI_ADJUST_CFA_OFFSET	9*8+\addskip
 	movq_cfi rdi, 8*8
 	movq_cfi rsi, 7*8
 	movq_cfi rdx, 6*8
 
-	.if \norcx
-	.else
+	.if \save_rcx
 	movq_cfi rcx, 5*8
 	.endif
 
 	movq_cfi rax, 4*8
 
-	.if \nor891011
-	.else
+	.if \save_r891011
 	movq_cfi r8,  3*8
 	movq_cfi r9,  2*8
 	movq_cfi r10, 1*8