diff for duplicates of <20050830001905.GA18279@linux.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index 60e95d7..c384ff2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,7 +39,8 @@ This would make all the kdebug.h::notify_die() calls use the inline version. 7 files changed, 24 insertions(+), 18 deletions(-) Index: linux-2.6.13/include/linux/notifier.h -=================================--- linux-2.6.13.orig/include/linux/notifier.h +=================================================================== +--- linux-2.6.13.orig/include/linux/notifier.h +++ linux-2.6.13/include/linux/notifier.h @@ -72,5 +72,23 @@ extern int notifier_call_chain(struct no #define CPU_DOWN_FAILED 0x0006 /* CPU (unsigned)v NOT going down */ @@ -66,7 +67,8 @@ Index: linux-2.6.13/include/linux/notifier.h #endif /* __KERNEL__ */ #endif /* _LINUX_NOTIFIER_H */ Index: linux-2.6.13/kernel/sys.c -=================================--- linux-2.6.13.orig/kernel/sys.c +=================================================================== +--- linux-2.6.13.orig/kernel/sys.c +++ linux-2.6.13/kernel/sys.c @@ -169,19 +169,7 @@ EXPORT_SYMBOL(notifier_chain_unregister) @@ -90,7 +92,8 @@ Index: linux-2.6.13/kernel/sys.c EXPORT_SYMBOL(notifier_call_chain); Index: linux-2.6.13/include/asm-ia64/kdebug.h -=================================--- linux-2.6.13.orig/include/asm-ia64/kdebug.h +=================================================================== +--- linux-2.6.13.orig/include/asm-ia64/kdebug.h +++ linux-2.6.13/include/asm-ia64/kdebug.h @@ -55,7 +55,7 @@ static inline int notify_die(enum die_va .signr = sig @@ -102,7 +105,8 @@ Index: linux-2.6.13/include/asm-ia64/kdebug.h #endif Index: linux-2.6.13/include/asm-i386/kdebug.h -=================================--- linux-2.6.13.orig/include/asm-i386/kdebug.h +=================================================================== +--- linux-2.6.13.orig/include/asm-i386/kdebug.h +++ linux-2.6.13/include/asm-i386/kdebug.h @@ -44,7 +44,7 @@ enum die_val { static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig) @@ -114,7 +118,8 @@ Index: linux-2.6.13/include/asm-i386/kdebug.h #endif Index: linux-2.6.13/include/asm-ppc64/kdebug.h -=================================--- linux-2.6.13.orig/include/asm-ppc64/kdebug.h +=================================================================== +--- linux-2.6.13.orig/include/asm-ppc64/kdebug.h +++ linux-2.6.13/include/asm-ppc64/kdebug.h @@ -37,7 +37,7 @@ enum die_val { static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig) @@ -126,7 +131,8 @@ Index: linux-2.6.13/include/asm-ppc64/kdebug.h #endif Index: linux-2.6.13/include/asm-sparc64/kdebug.h -=================================--- linux-2.6.13.orig/include/asm-sparc64/kdebug.h +=================================================================== +--- linux-2.6.13.orig/include/asm-sparc64/kdebug.h +++ linux-2.6.13/include/asm-sparc64/kdebug.h @@ -46,7 +46,7 @@ static inline int notify_die(enum die_va .trapnr = trap, @@ -138,7 +144,8 @@ Index: linux-2.6.13/include/asm-sparc64/kdebug.h #endif Index: linux-2.6.13/include/asm-x86_64/kdebug.h -=================================--- linux-2.6.13.orig/include/asm-x86_64/kdebug.h +=================================================================== +--- linux-2.6.13.orig/include/asm-x86_64/kdebug.h +++ linux-2.6.13/include/asm-x86_64/kdebug.h @@ -38,7 +38,7 @@ enum die_val { static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig) diff --git a/a/content_digest b/N1/content_digest index 0efc0db..cffb006 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\0200508270224.26423.ak@suse.de\0" "From\0Rusty Lynch <rusty@linux.intel.com>\0" "Subject\0Re: [PATCH] Only process_die notifier in ia64_do_page_fault if KPROBES is configured.\0" - "Date\0Tue, 30 Aug 2005 00:19:05 +0000\0" + "Date\0Mon, 29 Aug 2005 17:19:05 -0700\0" "To\0Andi Kleen <ak@suse.de>\0" "Cc\0Christoph Lameter <clameter@engr.sgi.com>" Rusty Lynch <rusty.lynch@intel.com> @@ -55,7 +55,8 @@ " 7 files changed, 24 insertions(+), 18 deletions(-)\n" "\n" "Index: linux-2.6.13/include/linux/notifier.h\n" - "=================================--- linux-2.6.13.orig/include/linux/notifier.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/linux/notifier.h\n" "+++ linux-2.6.13/include/linux/notifier.h\n" "@@ -72,5 +72,23 @@ extern int notifier_call_chain(struct no\n" " #define CPU_DOWN_FAILED\t\t0x0006 /* CPU (unsigned)v NOT going down */\n" @@ -82,7 +83,8 @@ " #endif /* __KERNEL__ */\n" " #endif /* _LINUX_NOTIFIER_H */\n" "Index: linux-2.6.13/kernel/sys.c\n" - "=================================--- linux-2.6.13.orig/kernel/sys.c\n" + "===================================================================\n" + "--- linux-2.6.13.orig/kernel/sys.c\n" "+++ linux-2.6.13/kernel/sys.c\n" "@@ -169,19 +169,7 @@ EXPORT_SYMBOL(notifier_chain_unregister)\n" " \n" @@ -106,7 +108,8 @@ " \n" " EXPORT_SYMBOL(notifier_call_chain);\n" "Index: linux-2.6.13/include/asm-ia64/kdebug.h\n" - "=================================--- linux-2.6.13.orig/include/asm-ia64/kdebug.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/asm-ia64/kdebug.h\n" "+++ linux-2.6.13/include/asm-ia64/kdebug.h\n" "@@ -55,7 +55,7 @@ static inline int notify_die(enum die_va\n" " \t\t.signr = sig\n" @@ -118,7 +121,8 @@ " \n" " #endif\n" "Index: linux-2.6.13/include/asm-i386/kdebug.h\n" - "=================================--- linux-2.6.13.orig/include/asm-i386/kdebug.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/asm-i386/kdebug.h\n" "+++ linux-2.6.13/include/asm-i386/kdebug.h\n" "@@ -44,7 +44,7 @@ enum die_val {\n" " static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig)\n" @@ -130,7 +134,8 @@ " \n" " #endif\n" "Index: linux-2.6.13/include/asm-ppc64/kdebug.h\n" - "=================================--- linux-2.6.13.orig/include/asm-ppc64/kdebug.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/asm-ppc64/kdebug.h\n" "+++ linux-2.6.13/include/asm-ppc64/kdebug.h\n" "@@ -37,7 +37,7 @@ enum die_val {\n" " static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig)\n" @@ -142,7 +147,8 @@ " \n" " #endif\n" "Index: linux-2.6.13/include/asm-sparc64/kdebug.h\n" - "=================================--- linux-2.6.13.orig/include/asm-sparc64/kdebug.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/asm-sparc64/kdebug.h\n" "+++ linux-2.6.13/include/asm-sparc64/kdebug.h\n" "@@ -46,7 +46,7 @@ static inline int notify_die(enum die_va\n" " \t\t\t\t .trapnr\t= trap,\n" @@ -154,7 +160,8 @@ " \n" " #endif\n" "Index: linux-2.6.13/include/asm-x86_64/kdebug.h\n" - "=================================--- linux-2.6.13.orig/include/asm-x86_64/kdebug.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/asm-x86_64/kdebug.h\n" "+++ linux-2.6.13/include/asm-x86_64/kdebug.h\n" "@@ -38,7 +38,7 @@ enum die_val { \n" " static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig)\n" @@ -166,4 +173,4 @@ " \n" extern int printk_address(unsigned long address); -9a1f01431b3622da4cc9d6789aaf5d6b26915343eb1a4c9eac666310d2a8bdca +5407c8dc6c8cf599605c1304e091ebede7cfff79fc6a1f18f0413ef75537dc5c
diff --git a/a/1.txt b/N2/1.txt index 60e95d7..468ab36 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -39,7 +39,8 @@ This would make all the kdebug.h::notify_die() calls use the inline version. 7 files changed, 24 insertions(+), 18 deletions(-) Index: linux-2.6.13/include/linux/notifier.h -=================================--- linux-2.6.13.orig/include/linux/notifier.h +=================================================================== +--- linux-2.6.13.orig/include/linux/notifier.h +++ linux-2.6.13/include/linux/notifier.h @@ -72,5 +72,23 @@ extern int notifier_call_chain(struct no #define CPU_DOWN_FAILED 0x0006 /* CPU (unsigned)v NOT going down */ @@ -66,7 +67,8 @@ Index: linux-2.6.13/include/linux/notifier.h #endif /* __KERNEL__ */ #endif /* _LINUX_NOTIFIER_H */ Index: linux-2.6.13/kernel/sys.c -=================================--- linux-2.6.13.orig/kernel/sys.c +=================================================================== +--- linux-2.6.13.orig/kernel/sys.c +++ linux-2.6.13/kernel/sys.c @@ -169,19 +169,7 @@ EXPORT_SYMBOL(notifier_chain_unregister) @@ -90,7 +92,8 @@ Index: linux-2.6.13/kernel/sys.c EXPORT_SYMBOL(notifier_call_chain); Index: linux-2.6.13/include/asm-ia64/kdebug.h -=================================--- linux-2.6.13.orig/include/asm-ia64/kdebug.h +=================================================================== +--- linux-2.6.13.orig/include/asm-ia64/kdebug.h +++ linux-2.6.13/include/asm-ia64/kdebug.h @@ -55,7 +55,7 @@ static inline int notify_die(enum die_va .signr = sig @@ -102,7 +105,8 @@ Index: linux-2.6.13/include/asm-ia64/kdebug.h #endif Index: linux-2.6.13/include/asm-i386/kdebug.h -=================================--- linux-2.6.13.orig/include/asm-i386/kdebug.h +=================================================================== +--- linux-2.6.13.orig/include/asm-i386/kdebug.h +++ linux-2.6.13/include/asm-i386/kdebug.h @@ -44,7 +44,7 @@ enum die_val { static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig) @@ -114,7 +118,8 @@ Index: linux-2.6.13/include/asm-i386/kdebug.h #endif Index: linux-2.6.13/include/asm-ppc64/kdebug.h -=================================--- linux-2.6.13.orig/include/asm-ppc64/kdebug.h +=================================================================== +--- linux-2.6.13.orig/include/asm-ppc64/kdebug.h +++ linux-2.6.13/include/asm-ppc64/kdebug.h @@ -37,7 +37,7 @@ enum die_val { static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig) @@ -126,7 +131,8 @@ Index: linux-2.6.13/include/asm-ppc64/kdebug.h #endif Index: linux-2.6.13/include/asm-sparc64/kdebug.h -=================================--- linux-2.6.13.orig/include/asm-sparc64/kdebug.h +=================================================================== +--- linux-2.6.13.orig/include/asm-sparc64/kdebug.h +++ linux-2.6.13/include/asm-sparc64/kdebug.h @@ -46,7 +46,7 @@ static inline int notify_die(enum die_va .trapnr = trap, @@ -138,7 +144,8 @@ Index: linux-2.6.13/include/asm-sparc64/kdebug.h #endif Index: linux-2.6.13/include/asm-x86_64/kdebug.h -=================================--- linux-2.6.13.orig/include/asm-x86_64/kdebug.h +=================================================================== +--- linux-2.6.13.orig/include/asm-x86_64/kdebug.h +++ linux-2.6.13/include/asm-x86_64/kdebug.h @@ -38,7 +38,7 @@ enum die_val { static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig) @@ -149,3 +156,8 @@ Index: linux-2.6.13/include/asm-x86_64/kdebug.h } extern int printk_address(unsigned long address); +-- +To unsubscribe, send a message with 'unsubscribe linux-mm' in +the body to majordomo@kvack.org. For more info on Linux MM, +see: http://www.linux-mm.org/ . +Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> diff --git a/a/content_digest b/N2/content_digest index 0efc0db..a827f1f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,7 @@ "ref\0200508270224.26423.ak@suse.de\0" "From\0Rusty Lynch <rusty@linux.intel.com>\0" "Subject\0Re: [PATCH] Only process_die notifier in ia64_do_page_fault if KPROBES is configured.\0" - "Date\0Tue, 30 Aug 2005 00:19:05 +0000\0" + "Date\0Mon, 29 Aug 2005 17:19:05 -0700\0" "To\0Andi Kleen <ak@suse.de>\0" "Cc\0Christoph Lameter <clameter@engr.sgi.com>" Rusty Lynch <rusty.lynch@intel.com> @@ -55,7 +55,8 @@ " 7 files changed, 24 insertions(+), 18 deletions(-)\n" "\n" "Index: linux-2.6.13/include/linux/notifier.h\n" - "=================================--- linux-2.6.13.orig/include/linux/notifier.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/linux/notifier.h\n" "+++ linux-2.6.13/include/linux/notifier.h\n" "@@ -72,5 +72,23 @@ extern int notifier_call_chain(struct no\n" " #define CPU_DOWN_FAILED\t\t0x0006 /* CPU (unsigned)v NOT going down */\n" @@ -82,7 +83,8 @@ " #endif /* __KERNEL__ */\n" " #endif /* _LINUX_NOTIFIER_H */\n" "Index: linux-2.6.13/kernel/sys.c\n" - "=================================--- linux-2.6.13.orig/kernel/sys.c\n" + "===================================================================\n" + "--- linux-2.6.13.orig/kernel/sys.c\n" "+++ linux-2.6.13/kernel/sys.c\n" "@@ -169,19 +169,7 @@ EXPORT_SYMBOL(notifier_chain_unregister)\n" " \n" @@ -106,7 +108,8 @@ " \n" " EXPORT_SYMBOL(notifier_call_chain);\n" "Index: linux-2.6.13/include/asm-ia64/kdebug.h\n" - "=================================--- linux-2.6.13.orig/include/asm-ia64/kdebug.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/asm-ia64/kdebug.h\n" "+++ linux-2.6.13/include/asm-ia64/kdebug.h\n" "@@ -55,7 +55,7 @@ static inline int notify_die(enum die_va\n" " \t\t.signr = sig\n" @@ -118,7 +121,8 @@ " \n" " #endif\n" "Index: linux-2.6.13/include/asm-i386/kdebug.h\n" - "=================================--- linux-2.6.13.orig/include/asm-i386/kdebug.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/asm-i386/kdebug.h\n" "+++ linux-2.6.13/include/asm-i386/kdebug.h\n" "@@ -44,7 +44,7 @@ enum die_val {\n" " static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig)\n" @@ -130,7 +134,8 @@ " \n" " #endif\n" "Index: linux-2.6.13/include/asm-ppc64/kdebug.h\n" - "=================================--- linux-2.6.13.orig/include/asm-ppc64/kdebug.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/asm-ppc64/kdebug.h\n" "+++ linux-2.6.13/include/asm-ppc64/kdebug.h\n" "@@ -37,7 +37,7 @@ enum die_val {\n" " static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig)\n" @@ -142,7 +147,8 @@ " \n" " #endif\n" "Index: linux-2.6.13/include/asm-sparc64/kdebug.h\n" - "=================================--- linux-2.6.13.orig/include/asm-sparc64/kdebug.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/asm-sparc64/kdebug.h\n" "+++ linux-2.6.13/include/asm-sparc64/kdebug.h\n" "@@ -46,7 +46,7 @@ static inline int notify_die(enum die_va\n" " \t\t\t\t .trapnr\t= trap,\n" @@ -154,7 +160,8 @@ " \n" " #endif\n" "Index: linux-2.6.13/include/asm-x86_64/kdebug.h\n" - "=================================--- linux-2.6.13.orig/include/asm-x86_64/kdebug.h\n" + "===================================================================\n" + "--- linux-2.6.13.orig/include/asm-x86_64/kdebug.h\n" "+++ linux-2.6.13/include/asm-x86_64/kdebug.h\n" "@@ -38,7 +38,7 @@ enum die_val { \n" " static inline int notify_die(enum die_val val,char *str,struct pt_regs *regs,long err,int trap, int sig)\n" @@ -164,6 +171,11 @@ "+\treturn fast_notifier_call_chain(&die_chain, val, &args);\n" " } \n" " \n" - extern int printk_address(unsigned long address); + " extern int printk_address(unsigned long address);\n" + "--\n" + "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n" + "the body to majordomo@kvack.org. For more info on Linux MM,\n" + "see: http://www.linux-mm.org/ .\n" + "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>" -9a1f01431b3622da4cc9d6789aaf5d6b26915343eb1a4c9eac666310d2a8bdca +5a8e8f9006652481c40c14872a2f1930ebefe68792ef7b79eabbc315c2981adc
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.