diff for duplicates of <20040720200352.5c17b3f7.davem@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 8d08226..294e103 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,8 @@ testing. Thanks a lot. -=== arch/sparc64/Kconfig 1.52 vs edited ==--- 1.52/arch/sparc64/Kconfig 2004-05-24 10:09:14 -07:00 +===== arch/sparc64/Kconfig 1.52 vs edited ===== +--- 1.52/arch/sparc64/Kconfig 2004-05-24 10:09:14 -07:00 +++ edited/arch/sparc64/Kconfig 2004-07-20 19:49:30 -07:00 @@ -382,6 +382,7 @@ @@ -28,7 +29,8 @@ Thanks a lot. help This is experimental code which will enable you to run (many) Solaris binaries on your SPARC Linux machine. -=== arch/sparc64/kernel/entry.S 1.34 vs edited ==--- 1.34/arch/sparc64/kernel/entry.S 2004-06-20 12:32:28 -07:00 +===== arch/sparc64/kernel/entry.S 1.34 vs edited ===== +--- 1.34/arch/sparc64/kernel/entry.S 2004-06-20 12:32:28 -07:00 +++ edited/arch/sparc64/kernel/entry.S 2004-07-20 19:55:29 -07:00 @@ -1496,28 +1496,30 @@ /* SunOS's execv() call only specifies the argv argument, the @@ -125,7 +127,8 @@ Thanks a lot. sys_ptrace: add %sp, PTREGS_OFF, %o0 call do_ptrace add %o7, 1f-.-4, %o7 -=== arch/sparc64/kernel/process.c 1.55 vs edited ==--- 1.55/arch/sparc64/kernel/process.c 2004-06-01 21:42:33 -07:00 +===== arch/sparc64/kernel/process.c 1.55 vs edited ===== +--- 1.55/arch/sparc64/kernel/process.c 2004-06-01 21:42:33 -07:00 +++ edited/arch/sparc64/kernel/process.c 2004-07-20 19:13:30 -07:00 @@ -12,6 +12,7 @@ @@ -150,7 +153,8 @@ Thanks a lot. parent_tid_ptr = (int __user *) regs->u_regs[UREG_I2]; child_tid_ptr = (int __user *) regs->u_regs[UREG_I4]; } -=== arch/sparc64/kernel/signal32.c 1.38 vs edited ==--- 1.38/arch/sparc64/kernel/signal32.c 2004-07-13 05:56:55 -07:00 +===== arch/sparc64/kernel/signal32.c 1.38 vs edited ===== +--- 1.38/arch/sparc64/kernel/signal32.c 2004-07-13 05:56:55 -07:00 +++ edited/arch/sparc64/kernel/signal32.c 2004-07-20 19:12:25 -07:00 @@ -59,6 +59,63 @@ unsigned int extramask[_COMPAT_NSIG_WORDS - 1]; @@ -345,7 +349,8 @@ Thanks a lot. + set_fs (old_fs); return ret; } -=== arch/sparc64/kernel/sys_sparc32.c 1.103 vs edited ==--- 1.103/arch/sparc64/kernel/sys_sparc32.c 2004-07-13 05:57:10 -07:00 +===== arch/sparc64/kernel/sys_sparc32.c 1.103 vs edited ===== +--- 1.103/arch/sparc64/kernel/sys_sparc32.c 2004-07-13 05:57:10 -07:00 +++ edited/arch/sparc64/kernel/sys_sparc32.c 2004-07-20 19:12:04 -07:00 @@ -1176,106 +1176,19 @@ return ret; @@ -487,7 +492,8 @@ Thanks a lot. long sys32_timer_create(u32 clock, struct sigevent32 __user *se32, -=== arch/sparc64/kernel/systbls.S 1.60 vs edited ==--- 1.60/arch/sparc64/kernel/systbls.S 2004-06-01 21:42:33 -07:00 +===== arch/sparc64/kernel/systbls.S 1.60 vs edited ===== +--- 1.60/arch/sparc64/kernel/systbls.S 2004-06-01 21:42:33 -07:00 +++ edited/arch/sparc64/kernel/systbls.S 2004-07-20 19:56:06 -07:00 @@ -15,6 +15,7 @@ .text @@ -515,7 +521,8 @@ Thanks a lot. /*15*/ .word sys_chmod, sys_lchown, sparc_brk, sys_perfctr, sys_lseek /*20*/ .word sys_getpid, sys_capget, sys_capset, sys_setuid, sys_getuid /*25*/ .word sys_nis_syscall, sys_ptrace, sys_alarm, sys_sigaltstack, sys_nis_syscall -=== include/asm-sparc64/siginfo.h 1.15 vs edited ==--- 1.15/include/asm-sparc64/siginfo.h 2004-05-31 16:25:29 -07:00 +===== include/asm-sparc64/siginfo.h 1.15 vs edited ===== +--- 1.15/include/asm-sparc64/siginfo.h 2004-05-31 16:25:29 -07:00 +++ edited/include/asm-sparc64/siginfo.h 2004-07-20 19:12:32 -07:00 @@ -12,69 +12,6 @@ @@ -613,7 +620,8 @@ Thanks a lot. -#endif /* __KERNEL__ */ #endif -=== include/asm-sparc64/signal.h 1.14 vs edited ==--- 1.14/include/asm-sparc64/signal.h 2004-07-13 05:51:54 -07:00 +===== include/asm-sparc64/signal.h 1.14 vs edited ===== +--- 1.14/include/asm-sparc64/signal.h 2004-07-13 05:51:54 -07:00 +++ edited/include/asm-sparc64/signal.h 2004-07-20 19:09:41 -07:00 @@ -8,7 +8,6 @@ #ifndef __ASSEMBLY__ @@ -666,7 +674,8 @@ Thanks a lot. struct signal_deliver_cookie { int restart_syscall; unsigned long orig_i0; -=== include/asm-sparc64/ttable.h 1.8 vs edited ==--- 1.8/include/asm-sparc64/ttable.h 2003-08-18 01:08:52 -07:00 +===== include/asm-sparc64/ttable.h 1.8 vs edited ===== +--- 1.8/include/asm-sparc64/ttable.h 2003-08-18 01:08:52 -07:00 +++ edited/include/asm-sparc64/ttable.h 2004-07-20 19:51:24 -07:00 @@ -123,7 +123,11 @@ #else diff --git a/a/content_digest b/N1/content_digest index c540492..be23ee3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\052fz808qwy.fsf@topspin.com\0" "From\0David S. Miller <davem@redhat.com>\0" "Subject\0Re: [PATCH] Fix sparc64 build with CONFIG_COMPAT=n\0" - "Date\0Wed, 21 Jul 2004 03:03:52 +0000\0" + "Date\0Tue, 20 Jul 2004 20:03:52 -0700\0" "To\0Roland Dreier <roland@topspin.com>\0" "Cc\0ultralinux@vger.kernel.org" " linux-kernel@vger.kernel.org\0" @@ -18,7 +18,8 @@ "\n" "Thanks a lot.\n" "\n" - "=== arch/sparc64/Kconfig 1.52 vs edited ==--- 1.52/arch/sparc64/Kconfig\t2004-05-24 10:09:14 -07:00\n" + "===== arch/sparc64/Kconfig 1.52 vs edited =====\n" + "--- 1.52/arch/sparc64/Kconfig\t2004-05-24 10:09:14 -07:00\n" "+++ edited/arch/sparc64/Kconfig\t2004-07-20 19:49:30 -07:00\n" "@@ -382,6 +382,7 @@\n" " \n" @@ -37,7 +38,8 @@ " \thelp\n" " \t This is experimental code which will enable you to run (many)\n" " \t Solaris binaries on your SPARC Linux machine.\n" - "=== arch/sparc64/kernel/entry.S 1.34 vs edited ==--- 1.34/arch/sparc64/kernel/entry.S\t2004-06-20 12:32:28 -07:00\n" + "===== arch/sparc64/kernel/entry.S 1.34 vs edited =====\n" + "--- 1.34/arch/sparc64/kernel/entry.S\t2004-06-20 12:32:28 -07:00\n" "+++ edited/arch/sparc64/kernel/entry.S\t2004-07-20 19:55:29 -07:00\n" "@@ -1496,28 +1496,30 @@\n" " \t/* SunOS's execv() call only specifies the argv argument, the\n" @@ -134,7 +136,8 @@ " sys_ptrace:\tadd\t\t%sp, PTREGS_OFF, %o0\n" " \t\tcall\t\tdo_ptrace\n" " \t\t add\t\t%o7, 1f-.-4, %o7\n" - "=== arch/sparc64/kernel/process.c 1.55 vs edited ==--- 1.55/arch/sparc64/kernel/process.c\t2004-06-01 21:42:33 -07:00\n" + "===== arch/sparc64/kernel/process.c 1.55 vs edited =====\n" + "--- 1.55/arch/sparc64/kernel/process.c\t2004-06-01 21:42:33 -07:00\n" "+++ edited/arch/sparc64/kernel/process.c\t2004-07-20 19:13:30 -07:00\n" "@@ -12,6 +12,7 @@\n" " \n" @@ -159,7 +162,8 @@ " \t\tparent_tid_ptr = (int __user *) regs->u_regs[UREG_I2];\n" " \t\tchild_tid_ptr = (int __user *) regs->u_regs[UREG_I4];\n" " \t}\n" - "=== arch/sparc64/kernel/signal32.c 1.38 vs edited ==--- 1.38/arch/sparc64/kernel/signal32.c\t2004-07-13 05:56:55 -07:00\n" + "===== arch/sparc64/kernel/signal32.c 1.38 vs edited =====\n" + "--- 1.38/arch/sparc64/kernel/signal32.c\t2004-07-13 05:56:55 -07:00\n" "+++ edited/arch/sparc64/kernel/signal32.c\t2004-07-20 19:12:25 -07:00\n" "@@ -59,6 +59,63 @@\n" " \tunsigned int extramask[_COMPAT_NSIG_WORDS - 1];\n" @@ -354,7 +358,8 @@ "+\tset_fs (old_fs);\n" " \treturn ret;\n" " }\n" - "=== arch/sparc64/kernel/sys_sparc32.c 1.103 vs edited ==--- 1.103/arch/sparc64/kernel/sys_sparc32.c\t2004-07-13 05:57:10 -07:00\n" + "===== arch/sparc64/kernel/sys_sparc32.c 1.103 vs edited =====\n" + "--- 1.103/arch/sparc64/kernel/sys_sparc32.c\t2004-07-13 05:57:10 -07:00\n" "+++ edited/arch/sparc64/kernel/sys_sparc32.c\t2004-07-20 19:12:04 -07:00\n" "@@ -1176,106 +1176,19 @@\n" " \treturn ret;\n" @@ -496,7 +501,8 @@ " \n" " long\n" " sys32_timer_create(u32 clock, struct sigevent32 __user *se32,\n" - "=== arch/sparc64/kernel/systbls.S 1.60 vs edited ==--- 1.60/arch/sparc64/kernel/systbls.S\t2004-06-01 21:42:33 -07:00\n" + "===== arch/sparc64/kernel/systbls.S 1.60 vs edited =====\n" + "--- 1.60/arch/sparc64/kernel/systbls.S\t2004-06-01 21:42:33 -07:00\n" "+++ edited/arch/sparc64/kernel/systbls.S\t2004-07-20 19:56:06 -07:00\n" "@@ -15,6 +15,7 @@\n" " \t.text\n" @@ -524,7 +530,8 @@ " /*15*/\t.word sys_chmod, sys_lchown, sparc_brk, sys_perfctr, sys_lseek\n" " /*20*/\t.word sys_getpid, sys_capget, sys_capset, sys_setuid, sys_getuid\n" " /*25*/\t.word sys_nis_syscall, sys_ptrace, sys_alarm, sys_sigaltstack, sys_nis_syscall\n" - "=== include/asm-sparc64/siginfo.h 1.15 vs edited ==--- 1.15/include/asm-sparc64/siginfo.h\t2004-05-31 16:25:29 -07:00\n" + "===== include/asm-sparc64/siginfo.h 1.15 vs edited =====\n" + "--- 1.15/include/asm-sparc64/siginfo.h\t2004-05-31 16:25:29 -07:00\n" "+++ edited/include/asm-sparc64/siginfo.h\t2004-07-20 19:12:32 -07:00\n" "@@ -12,69 +12,6 @@\n" " \n" @@ -622,7 +629,8 @@ "-#endif /* __KERNEL__ */\n" " \n" " #endif\n" - "=== include/asm-sparc64/signal.h 1.14 vs edited ==--- 1.14/include/asm-sparc64/signal.h\t2004-07-13 05:51:54 -07:00\n" + "===== include/asm-sparc64/signal.h 1.14 vs edited =====\n" + "--- 1.14/include/asm-sparc64/signal.h\t2004-07-13 05:51:54 -07:00\n" "+++ edited/include/asm-sparc64/signal.h\t2004-07-20 19:09:41 -07:00\n" "@@ -8,7 +8,6 @@\n" " #ifndef __ASSEMBLY__\n" @@ -675,7 +683,8 @@ " struct signal_deliver_cookie {\n" " \tint restart_syscall;\n" " \tunsigned long orig_i0;\n" - "=== include/asm-sparc64/ttable.h 1.8 vs edited ==--- 1.8/include/asm-sparc64/ttable.h\t2003-08-18 01:08:52 -07:00\n" + "===== include/asm-sparc64/ttable.h 1.8 vs edited =====\n" + "--- 1.8/include/asm-sparc64/ttable.h\t2003-08-18 01:08:52 -07:00\n" "+++ edited/include/asm-sparc64/ttable.h\t2004-07-20 19:51:24 -07:00\n" "@@ -123,7 +123,11 @@\n" " #else\n" @@ -690,4 +699,4 @@ " #define GETCC_TRAP TRAP(getcc)\n" #define SETCC_TRAP TRAP(setcc) -76280d86d2aab324be29ff289785d9b0850819138881801564ba2fd6d3c1406d +157dcbe06b656b063178e65102083e5d09b5900b8242d358b2c2a401439c2ce1
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.