Merge branch 'fix/misc' into for-linus

[pandora-kernel.git] / arch / x86 / lib / clear_page_64.S

diff --git a/arch/x86/lib/clear_page_64.S b/arch/x86/lib/clear_page_64.S
index 9a10a78..ebeafcc 100644 (file)
--- 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