diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-05-05 08:59:37 -0400 |
| commit | bfd4bda097f8758d28e632ff2035e25577f6b060 (patch) | |
| tree | 022276b3625a432c7132e39776e7e448445087ac /arch/ia64/lib/memcpy_mck.S | |
| parent | 488f2eaca1b0831a5a5e6a66e33bad2cdeff7238 (diff) | |
| parent | b2d84f078a8be40f5ae3b4d2ac001e2a7f45fe4f (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ia64/lib/memcpy_mck.S')
| -rw-r--r-- | arch/ia64/lib/memcpy_mck.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/lib/memcpy_mck.S b/arch/ia64/lib/memcpy_mck.S index 3c2cd2f04db9..6f308e62c137 100644 --- a/arch/ia64/lib/memcpy_mck.S +++ b/arch/ia64/lib/memcpy_mck.S | |||
| @@ -75,6 +75,7 @@ GLOBAL_ENTRY(memcpy) | |||
| 75 | mov f6=f0 | 75 | mov f6=f0 |
| 76 | br.cond.sptk .common_code | 76 | br.cond.sptk .common_code |
| 77 | ;; | 77 | ;; |
| 78 | END(memcpy) | ||
| 78 | GLOBAL_ENTRY(__copy_user) | 79 | GLOBAL_ENTRY(__copy_user) |
| 79 | .prologue | 80 | .prologue |
| 80 | // check dest alignment | 81 | // check dest alignment |
| @@ -524,7 +525,6 @@ EK(.ex_handler, (p17) st8 [dst1]=r39,8); \ | |||
| 524 | #undef B | 525 | #undef B |
| 525 | #undef C | 526 | #undef C |
| 526 | #undef D | 527 | #undef D |
| 527 | END(memcpy) | ||
| 528 | 528 | ||
| 529 | /* | 529 | /* |
| 530 | * Due to lack of local tag support in gcc 2.x assembler, it is not clear which | 530 | * Due to lack of local tag support in gcc 2.x assembler, it is not clear which |