Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / arch / x86_64 / lib / iomap_copy.S

diff --git a/arch/x86_64/lib/iomap_copy.S b/arch/x86_64/lib/iomap_copy.S
index 8bbade5..05a95e7 100644 (file)
--- a/arch/x86_64/lib/iomap_copy.S
+++ b/arch/x86_64/lib/iomap_copy.S
@@ -15,12 +15,16 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
+#include <linux/linkage.h>
+#include <asm/dwarf2.h>
+
 /*
  * override generic version in lib/iomap_copy.c
  */
-       .globl __iowrite32_copy
-       .p2align 4
-__iowrite32_copy:
+ENTRY(__iowrite32_copy)
+       CFI_STARTPROC
        movl %edx,%ecx
        rep movsd
        ret
+       CFI_ENDPROC
+ENDPROC(__iowrite32_copy)