# HG changeset patch
# User iveresov
# Date 1301482118 25200
# Node ID fe1dbd98e18fe202a672fbcbb4abad91a387103f
# Parent  348c0df561a92ba9ab469566cd4dc8028e9ecc99# Parent  2cd0180da6e103407710d5456c69282f98f896e2
Merge

diff -r 2cd0180da6e1 -r fe1dbd98e18f src/cpu/x86/vm/stubGenerator_x86_64.cpp
--- a/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Tue Mar 29 22:05:21 2011 -0700
+++ b/src/cpu/x86/vm/stubGenerator_x86_64.cpp	Wed Mar 30 03:48:38 2011 -0700
@@ -2449,8 +2449,8 @@
   //
   address generate_generic_copy(const char *name,
                                 address byte_copy_entry, address short_copy_entry,
-                                address int_copy_entry, address long_copy_entry,
-                                address oop_copy_entry, address checkcast_copy_entry) {
+                                address int_copy_entry, address oop_copy_entry,
+                                address long_copy_entry, address checkcast_copy_entry) {
 
     Label L_failed, L_failed_0, L_objArray;
     Label L_copy_bytes, L_copy_shorts, L_copy_ints, L_copy_longs;