diff for duplicates of <20040820155250.69c09781.davem@redhat.com> diff --git a/a/1.txt b/N1/1.txt index c0b89bf..78d82ae 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,8 @@ There were a few slight bugs in the UltraSPARC-I/II/IIi/IIe parts of that patch I sent you, here is the fix. -=== arch/sparc64/lib/U1copy_from_user.S 1.1 vs edited ==--- 1.1/arch/sparc64/lib/U1copy_from_user.S 2004-08-19 20:10:28 -07:00 +===== arch/sparc64/lib/U1copy_from_user.S 1.1 vs edited ===== +--- 1.1/arch/sparc64/lib/U1copy_from_user.S 2004-08-19 20:10:28 -07:00 +++ edited/arch/sparc64/lib/U1copy_from_user.S 2004-08-20 10:22:41 -07:00 @@ -20,4 +20,14 @@ #define LOAD_BLK(addr,dest) ldda [addr] ASI_BLK_AIUS, dest @@ -19,7 +20,8 @@ parts of that patch I sent you, here is the fix. + nop; \ + #include "U1memcpy.S" -=== arch/sparc64/lib/U1memcpy.S 1.1 vs edited ==--- 1.1/arch/sparc64/lib/U1memcpy.S 2004-08-19 20:10:30 -07:00 +===== arch/sparc64/lib/U1memcpy.S 1.1 vs edited ===== +--- 1.1/arch/sparc64/lib/U1memcpy.S 2004-08-19 20:10:30 -07:00 +++ edited/arch/sparc64/lib/U1memcpy.S 2004-08-20 11:37:27 -07:00 @@ -193,6 +193,7 @@ and %g2, 7, %g2 diff --git a/a/content_digest b/N1/content_digest index 2e00bc5..537c931 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0David S. Miller <davem@redhat.com>\0" "Subject\0[PATCH] fix bug in sparc64 user copy patch\0" - "Date\0Fri, 20 Aug 2004 22:52:50 +0000\0" + "Date\0Fri, 20 Aug 2004 15:52:50 -0700\0" "To\0joshk@triplehelix.org\0" "Cc\0sparclinux@vger.kernel.org" " linux-kernel@vger.kernel.org\0" @@ -10,7 +10,8 @@ "There were a few slight bugs in the UltraSPARC-I/II/IIi/IIe\n" "parts of that patch I sent you, here is the fix.\n" "\n" - "=== arch/sparc64/lib/U1copy_from_user.S 1.1 vs edited ==--- 1.1/arch/sparc64/lib/U1copy_from_user.S\t2004-08-19 20:10:28 -07:00\n" + "===== arch/sparc64/lib/U1copy_from_user.S 1.1 vs edited =====\n" + "--- 1.1/arch/sparc64/lib/U1copy_from_user.S\t2004-08-19 20:10:28 -07:00\n" "+++ edited/arch/sparc64/lib/U1copy_from_user.S\t2004-08-20 10:22:41 -07:00\n" "@@ -20,4 +20,14 @@\n" " #define LOAD_BLK(addr,dest)\tldda [addr] ASI_BLK_AIUS, dest\n" @@ -27,7 +28,8 @@ "+\t nop;\t\t\t\t\t\t\\\n" "+\n" " #include \"U1memcpy.S\"\n" - "=== arch/sparc64/lib/U1memcpy.S 1.1 vs edited ==--- 1.1/arch/sparc64/lib/U1memcpy.S\t2004-08-19 20:10:30 -07:00\n" + "===== arch/sparc64/lib/U1memcpy.S 1.1 vs edited =====\n" + "--- 1.1/arch/sparc64/lib/U1memcpy.S\t2004-08-19 20:10:30 -07:00\n" "+++ edited/arch/sparc64/lib/U1memcpy.S\t2004-08-20 11:37:27 -07:00\n" "@@ -193,6 +193,7 @@\n" " \tand\t\t%g2, 7, %g2\n" @@ -62,4 +64,4 @@ "-\t mov\t\t%g5, %o0\n" "+\t mov\t\tEX_RETVAL(%g5), %o0" -53a7f551675183dba8372587395f8d54edd3449d1b35fa62fa1a5eca5d8d6922 +1da20384e172be8d94d03115b767768e3084a86024f5b198ed8114db70d67315
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.