[PATCH] i386: restore parentheses around one pushl_cfi argument

[PATCH] i386: restore parentheses around one pushl_cfi argument

[Jan Beulich]

These were (intentionally) stripped by "fix CFI macro invocations to
deal with shortcomings in gas" to expose problems with unexpected
splitting of arguments by older gas also on newer versions, but as it
turns out there is at least one distro (Ubuntu 6.06) where even not
having *any* spaces in a macro argument doesn't reliably prevent
splitting into multiple arguments.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>

---
 arch/x86/kernel/entry_32.S        |    2 +-
 1 files changed, 1 insertion, 1 deletion

--- 2.6.36-x86-cfi.orig/arch/x86/kernel/entry_32.S
+++ 2.6.36-x86-cfi/arch/x86/kernel/entry_32.S
@@ -395,7 +395,7 @@ sysenter_past_esp:
 	 * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
 	 * pushed above; +8 corresponds to copy_thread's esp0 setting.
 	 */
-	pushl_cfi TI_sysenter_return-THREAD_SIZE_asm+8+4*4(%esp)
+	pushl_cfi (TI_sysenter_return-THREAD_SIZE_asm+8+4*4)(%esp)
 	CFI_REL_OFFSET eip, 0
 
 	pushl_cfi %eax

[tip:x86/debug] x86, asm: Restore parentheses around one pushl_cfi argument

[tip-bot for Jan Beulich]

Commit-ID:  07bd8516a2f967aa67904c68ab97bb896a448b09
Gitweb:     http://git.kernel.org/tip/07bd8516a2f967aa67904c68ab97bb896a448b09
Author:     Jan Beulich <JBeulich@novell.com>
AuthorDate: Fri, 22 Oct 2010 08:22:35 +0100
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 22 Oct 2010 10:51:44 +0200

x86, asm: Restore parentheses around one pushl_cfi argument

These were (intentionally) stripped by "fix CFI macro
invocations to deal with shortcomings in gas" to expose problems
with unexpected splitting of arguments by older gas also on
newer versions, but as it turns out there is at least one distro
(Ubuntu 6.06) where even not having *any* spaces in a macro
argument doesn't reliably prevent splitting into multiple
arguments.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
LKML-Reference: <4CC157DB020000780001E8A2@vpn.id2.novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/kernel/entry_32.S |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index f73a4b8..59e175e 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -395,7 +395,7 @@ sysenter_past_esp:
 	 * A tiny bit of offset fixup is necessary - 4*4 means the 4 words
 	 * pushed above; +8 corresponds to copy_thread's esp0 setting.
 	 */
-	pushl_cfi TI_sysenter_return-THREAD_SIZE_asm+8+4*4(%esp)
+	pushl_cfi (TI_sysenter_return-THREAD_SIZE_asm+8+4*4)(%esp)
 	CFI_REL_OFFSET eip, 0
 
 	pushl_cfi %eax