1 files changed, 27 insertions, 25 deletions
diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h
index 0e63c9a2a8d0..30af5a832163 100644
--- a/arch/x86/include/asm/calling.h
+++ b/arch/x86/include/asm/calling.h
@@ -48,36 +48,38 @@ For 32-bit we have the following conventions - kernel is built with
 /*
- * 64-bit system call stack frame layout defines and helpers,
+ * 64-bit system call stack frame layout defines and helpers, for
- * for assembly code:
+ * assembly code (note that the seemingly unnecessary parentheses
+ * are to prevent cpp from inserting spaces in expressions that get
+ * passed to macros):
 */
-#define R15               0
+#define R15               (0)
-#define R14               8
+#define R14               (8)
-#define R13              16
+#define R13              (16)
-#define R12              24
+#define R12              (24)
-#define RBP              32
+#define RBP              (32)
-#define RBX              40
+#define RBX              (40)
 /* arguments: interrupts/non tracing syscalls only save up to here: */
-#define R11              48
+#define R11              (48)
-#define R10              56
+#define R10              (56)
-#define R9               64
+#define R9               (64)
-#define R8               72
+#define R8               (72)
-#define RAX              80
+#define RAX              (80)
-#define RCX              88
+#define RCX              (88)
-#define RDX              96
+#define RDX              (96)
-#define RSI             104
+#define RSI             (104)
-#define RDI             112
+#define RDI             (112)
-#define ORIG_RAX        120       /* + error_code */
+#define ORIG_RAX        (120)       /* + error_code */
 /* end of arguments */
 /* cpu exception frame or undefined in case of fast syscall: */
-#define RIP             128
+#define RIP             (128)
-#define CS              136
+#define CS              (136)
-#define EFLAGS          144
+#define EFLAGS          (144)
-#define RSP             152
+#define RSP             (152)
-#define SS              160
+#define SS              (160)
 #define ARGOFFSET       R11
 #define SWFRAME         ORIG_RAX
@@ -111,7 +113,7 @@ For 32-bit we have the following conventions - kernel is built with
        .endif
        .endm
-#define ARG_SKIP        9*8
+#define ARG_SKIP        (9*8)
        .macro RESTORE_ARGS skiprax=0, addskip=0, skiprcx=0, skipr11=0, \
                            skipr8910=0, skiprdx=0
@@ -169,7 +171,7 @@ For 32-bit we have the following conventions - kernel is built with
        .endif
        .endm
-#define REST_SKIP       6*8
+#define REST_SKIP       (6*8)
        .macro SAVE_REST
        subq $REST_SKIP, %rsp

diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h index 0e63c9a2a8d0..30af5a832163 100644 --- a/arch/x86/include/asm/calling.h +++ b/arch/x86/include/asm/calling.h
@@ -48,36 +48,38 @@ For 32-bit we have the following conventions - kernel is built with
48		48
49		49
50	/*	50	/*
51	* 64-bit system call stack frame layout defines and helpers,	51	* 64-bit system call stack frame layout defines and helpers, for
52	* for assembly code:	52	* assembly code (note that the seemingly unnecessary parentheses
		53	* are to prevent cpp from inserting spaces in expressions that get
		54	* passed to macros):
53	*/	55	*/
54		56
55	#define R15 0	57	#define R15 (0)
56	#define R14 8	58	#define R14 (8)
57	#define R13 16	59	#define R13 (16)
58	#define R12 24	60	#define R12 (24)
59	#define RBP 32	61	#define RBP (32)
60	#define RBX 40	62	#define RBX (40)
61		63
62	/* arguments: interrupts/non tracing syscalls only save up to here: */	64	/* arguments: interrupts/non tracing syscalls only save up to here: */
63	#define R11 48	65	#define R11 (48)
64	#define R10 56	66	#define R10 (56)
65	#define R9 64	67	#define R9 (64)
66	#define R8 72	68	#define R8 (72)
67	#define RAX 80	69	#define RAX (80)
68	#define RCX 88	70	#define RCX (88)
69	#define RDX 96	71	#define RDX (96)
70	#define RSI 104	72	#define RSI (104)
71	#define RDI 112	73	#define RDI (112)
72	#define ORIG_RAX 120 /* + error_code */	74	#define ORIG_RAX (120) /* + error_code */
73	/* end of arguments */	75	/* end of arguments */
74		76
75	/* cpu exception frame or undefined in case of fast syscall: */	77	/* cpu exception frame or undefined in case of fast syscall: */
76	#define RIP 128	78	#define RIP (128)
77	#define CS 136	79	#define CS (136)
78	#define EFLAGS 144	80	#define EFLAGS (144)
79	#define RSP 152	81	#define RSP (152)
80	#define SS 160	82	#define SS (160)
81		83
82	#define ARGOFFSET R11	84	#define ARGOFFSET R11
83	#define SWFRAME ORIG_RAX	85	#define SWFRAME ORIG_RAX
@@ -111,7 +113,7 @@ For 32-bit we have the following conventions - kernel is built with
111	.endif	113	.endif
112	.endm	114	.endm
113		115
114	#define ARG_SKIP 9*8	116	#define ARG_SKIP (9*8)
115		117
116	.macro RESTORE_ARGS skiprax=0, addskip=0, skiprcx=0, skipr11=0, \	118	.macro RESTORE_ARGS skiprax=0, addskip=0, skiprcx=0, skipr11=0, \
117	skipr8910=0, skiprdx=0	119	skipr8910=0, skiprdx=0
@@ -169,7 +171,7 @@ For 32-bit we have the following conventions - kernel is built with
169	.endif	171	.endif
170	.endm	172	.endm
171		173
172	#define REST_SKIP 6*8	174	#define REST_SKIP (6*8)
173		175
174	.macro SAVE_REST	176	.macro SAVE_REST
175	subq $REST_SKIP, %rsp	177	subq $REST_SKIP, %rsp