2010-11-16 04:45:35

by Tetsuo Handa

Subject: [PATCH 2.6.37-rc2] x86, asm: Add parentheses around one pushl_cfi argument

>From ed935c12f0b2b09c1586d22925261378e0d7eb83 Mon Sep 17 00:00:00 2001
From: Tetsuo Handa <[email protected]>
Date: Tue, 16 Nov 2010 13:33:07 +0900
Subject: [PATCH] x86, asm: Add parentheses around one pushl_cfi argument

Commit df5d1874 "x86: Use {push,pop}{l,q}_cfi in more places" caused GNU
assembler 2.15 (Debian Sarge) to fail. It is still failing as of commit
07bd8516 "x86, asm: Restore parentheses around one pushl_cfi argument".
This patch solves build failure with GNU assembler 2.15.

Signed-off-by: Tetsuo Handa <[email protected]>
---
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 59e175e..591e601 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
--
1.7.1

2010-11-16 07:39:43

by Jan Beulich

Subject: Re: [PATCH 2.6.37-rc2] x86, asm: Add parentheses around one pushl_cfi argument

>>> On 16.11.10 at 05:45, Tetsuo Handa <[email protected]> wrote:
> From ed935c12f0b2b09c1586d22925261378e0d7eb83 Mon Sep 17 00:00:00 2001
> From: Tetsuo Handa <[email protected]>
> Date: Tue, 16 Nov 2010 13:33:07 +0900
> Subject: [PATCH] x86, asm: Add parentheses around one pushl_cfi argument
>
> Commit df5d1874 "x86: Use {push,pop}{l,q}_cfi in more places" caused GNU
> assembler 2.15 (Debian Sarge) to fail. It is still failing as of commit
> 07bd8516 "x86, asm: Restore parentheses around one pushl_cfi argument".
> This patch solves build failure with GNU assembler 2.15.
>
> Signed-off-by: Tetsuo Handa <[email protected]>

Acked-by: Jan Beulich <[email protected]>

> ---
> 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 59e175e..591e601 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

2010-11-18 14:06:42

by Tetsuo Handa

Subject: [tip:x86/urgent] x86, asm: Fix binutils 2.15 build failure

Commit-ID: 96e612ffc301372d3a3b94e2cb5d1e0c1c207dd1
Gitweb: http://git.kernel.org/tip/96e612ffc301372d3a3b94e2cb5d1e0c1c207dd1
Author: Tetsuo Handa <[email protected]>
AuthorDate: Tue, 16 Nov 2010 13:45:16 +0900
Committer: Ingo Molnar <[email protected]>
CommitDate: Thu, 18 Nov 2010 09:25:11 +0100

x86, asm: Fix binutils 2.15 build failure

Add parentheses around one pushl_cfi argument.

Commit df5d1874 "x86: Use {push,pop}{l,q}_cfi in more places"
caused GNU assembler 2.15 (Debian Sarge) to fail. It is still
failing as of commit 07bd8516 "x86, asm: Restore parentheses
around one pushl_cfi argument". This patch solves build failure
with GNU assembler 2.15.

Signed-off-by: Tetsuo Handa <[email protected]>
Acked-by: Jan Beulich <[email protected]>
Cc: [email protected]
Cc: [email protected]
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
---
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 59e175e..591e601 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