[patch] x86: fix arch/x86/lib/clear_page_64.S::clear_page_c annotation

[patch] x86: fix arch/x86/lib/clear_page_64.S::clear_page_c annotation

[Mike Galbraith]

x86: fix arch/x86/lib/clear_page_64.S::clear_page_c annotation.

Signed-off-by: Mike Galbraith <efault@gmx.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Alexander van Heukelum <heukelum@mailshack.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
LKML-Reference: <new-submission>

---
 arch/x86/lib/clear_page_64.S |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6/arch/x86/lib/clear_page_64.S
===================================================================
--- linux-2.6.orig/arch/x86/lib/clear_page_64.S
+++ linux-2.6/arch/x86/lib/clear_page_64.S
@@ -6,14 +6,14 @@
  * rdi	page
  */			
 	ALIGN
-clear_page_c:
+ENTRY(clear_page_c)
 	CFI_STARTPROC
 	movl $4096/8,%ecx
 	xorl %eax,%eax
 	rep stosq
 	ret
 	CFI_ENDPROC
-ENDPROC(clear_page)
+ENDPROC(clear_page_c)
 
 ENTRY(clear_page)
 	CFI_STARTPROC

Re: [patch] x86: fix arch/x86/lib/clear_page_64.S::clear_page_c annotation

[Alexander van Heukelum]

Hi Mike,

I agree with the code, but I do have a remark...

The ENTRY() macro already includes the ALIGN, so you could get
rid of the preceding ALIGN. But it's just a neatness thing, because
two consecutive ALIGNS don't change the resulting binary.

At any rate:

Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>

(maybe the x86-committer feels comfortable enough to remove the ALIGN ;)
)

On Tue, 30 Jun 2009 12:54:00 +0200, "Mike Galbraith" <efault@gmx.de>
said:
> x86: fix arch/x86/lib/clear_page_64.S::clear_page_c annotation.
> 
> Signed-off-by: Mike Galbraith <efault@gmx.de>
> Cc: Ingo Molnar <mingo@elte.hu>
> Cc: Alexander van Heukelum <heukelum@mailshack.com>
> Cc: Cyrill Gorcunov <gorcunov@gmail.com>
> LKML-Reference: <new-submission>
> 
> ---
>  arch/x86/lib/clear_page_64.S |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> Index: linux-2.6/arch/x86/lib/clear_page_64.S
> ===================================================================
> --- linux-2.6.orig/arch/x86/lib/clear_page_64.S
> +++ linux-2.6/arch/x86/lib/clear_page_64.S
> @@ -6,14 +6,14 @@
>   * rdi	page
>   */			
>  	ALIGN
> -clear_page_c:
> +ENTRY(clear_page_c)
>  	CFI_STARTPROC
>  	movl $4096/8,%ecx
>  	xorl %eax,%eax
>  	rep stosq
>  	ret
>  	CFI_ENDPROC
> -ENDPROC(clear_page)
> +ENDPROC(clear_page_c)
>  
>  ENTRY(clear_page)
>  	CFI_STARTPROC
> 
> 

Re: [patch] x86: fix arch/x86/lib/clear_page_64.S::clear_page_c annotation

[Mike Galbraith]

On Tue, 2009-06-30 at 13:42 +0200, Alexander van Heukelum wrote:
> Hi Mike,
> 
> I agree with the code, but I do have a remark...
> 
> The ENTRY() macro already includes the ALIGN, so you could get
> rid of the preceding ALIGN. But it's just a neatness thing, because
> two consecutive ALIGNS don't change the resulting binary.
> 
> At any rate:
> 
> Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
> 
> (maybe the x86-committer feels comfortable enough to remove the ALIGN ;)
> )

No doubt, but I can save him the trouble ;-)

x86: fix incorrect arch/x86/lib/clear_page_64.S::clear_page_c annotation.

Signed-off-by: Mike Galbraith <efault@gmx.de>
Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
LKML-Reference: <new-submission>

---
 arch/x86/lib/clear_page_64.S |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Index: linux-2.6/arch/x86/lib/clear_page_64.S
===================================================================
--- linux-2.6.orig/arch/x86/lib/clear_page_64.S
+++ linux-2.6/arch/x86/lib/clear_page_64.S
@@ -5,15 +5,14 @@
  * Zero a page. 	
  * rdi	page
  */			
-	ALIGN
-clear_page_c:
+ENTRY(clear_page_c)
 	CFI_STARTPROC
 	movl $4096/8,%ecx
 	xorl %eax,%eax
 	rep stosq
 	ret
 	CFI_ENDPROC
-ENDPROC(clear_page)
+ENDPROC(clear_page_c)
 
 ENTRY(clear_page)
 	CFI_STARTPROC

Re: [patch] x86: fix arch/x86/lib/clear_page_64.S::clear_page_c annotation

[Cyrill Gorcunov]

[Mike Galbraith - Tue, Jun 30, 2009 at 03:00:20PM +0200]
| On Tue, 2009-06-30 at 13:42 +0200, Alexander van Heukelum wrote:
| > Hi Mike,
| > 
| > I agree with the code, but I do have a remark...
| > 
| > The ENTRY() macro already includes the ALIGN, so you could get
| > rid of the preceding ALIGN. But it's just a neatness thing, because
| > two consecutive ALIGNS don't change the resulting binary.
| > 
| > At any rate:
| > 
| > Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
| > 
| > (maybe the x86-committer feels comfortable enough to remove the ALIGN ;)
| > )
| 
| No doubt, but I can save him the trouble ;-)
| 
| x86: fix incorrect arch/x86/lib/clear_page_64.S::clear_page_c annotation.
| 
| Signed-off-by: Mike Galbraith <efault@gmx.de>
| Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
| Cc: Ingo Molnar <mingo@elte.hu>
| Cc: Cyrill Gorcunov <gorcunov@gmail.com>
| LKML-Reference: <new-submission>
| 
| ---
|  arch/x86/lib/clear_page_64.S |    5 ++---
|  1 file changed, 2 insertions(+), 3 deletions(-)
|
...

Thanks Mike, here is my Ack (if needed)

Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
 
	-- Cyrill

[tip:x86/urgent] x86: Fix symbol annotation for arch/x86/lib/clear_page_64.S::clear_page_c

[tip-bot for Mike Galbraith]

Commit-ID:  9e314996e3dc5189b9b36dce67088e882e989897
Gitweb:     http://git.kernel.org/tip/9e314996e3dc5189b9b36dce67088e882e989897
Author:     Mike Galbraith <efault@gmx.de>
AuthorDate: Tue, 30 Jun 2009 15:00:20 +0200
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 30 Jun 2009 23:43:15 +0200

x86: Fix symbol annotation for arch/x86/lib/clear_page_64.S::clear_page_c

Noticed the zero-sized function symbol while looking at 'perf' profiles,
it causes the profiler to display those addresses in hexa.

Turns out that this was wrong/bogus for an eternity.

Signed-off-by: Mike Galbraith <efault@gmx.de>
Acked-by: Alexander van Heukelum <heukelum@fastmail.fm>
Acked-by: Cyrill Gorcunov <gorcunov@gmail.com>
LKML-Reference: <1246366820.6538.1.camel@marge.simson.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 arch/x86/lib/clear_page_64.S |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
index 9a10a78..ebeafcc 100644
--- a/arch/x86/lib/clear_page_64.S
+++ b/arch/x86/lib/clear_page_64.S
@@ -5,15 +5,14 @@
  * Zero a page. 	
  * rdi	page
  */			
-	ALIGN
-clear_page_c:
+ENTRY(clear_page_c)
 	CFI_STARTPROC
 	movl $4096/8,%ecx
 	xorl %eax,%eax
 	rep stosq
 	ret
 	CFI_ENDPROC
-ENDPROC(clear_page)
+ENDPROC(clear_page_c)
 
 ENTRY(clear_page)
 	CFI_STARTPROC