diff for duplicates of <20080103072227.408558115@goodmis.org> diff --git a/a/1.txt b/N1/1.txt index 293aa6e..ec74e5a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,7 +12,8 @@ Signed-off-by: Steven Rostedt <srostedt@redhat.com> 6 files changed, 9 insertions(+), 8 deletions(-) Index: linux-compile.git/arch/x86/kernel/head64.c -=================================--- linux-compile.git.orig/arch/x86/kernel/head64.c 2007-12-19 21:44:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/head64.c 2007-12-19 21:44:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/head64.c 2007-12-20 00:52:47.000000000 -0500 @@ -46,7 +46,7 @@ static void __init copy_bootdata(char *r } @@ -24,7 +25,8 @@ Index: linux-compile.git/arch/x86/kernel/head64.c int i; Index: linux-compile.git/arch/x86/kernel/nmi_64.c -=================================--- linux-compile.git.orig/arch/x86/kernel/nmi_64.c 2007-12-19 21:44:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/nmi_64.c 2007-12-19 21:44:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/nmi_64.c 2007-12-20 00:51:50.000000000 -0500 @@ -314,7 +314,7 @@ void touch_nmi_watchdog(void) touch_softlockup_watchdog(); @@ -36,7 +38,8 @@ Index: linux-compile.git/arch/x86/kernel/nmi_64.c int sum; int touched = 0; Index: linux-compile.git/arch/x86/kernel/setup64.c -=================================--- linux-compile.git.orig/arch/x86/kernel/setup64.c 2007-12-19 21:44:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/setup64.c 2007-12-19 21:44:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/setup64.c 2007-12-20 00:52:32.000000000 -0500 @@ -114,7 +114,7 @@ void __init setup_per_cpu_areas(void) } @@ -57,7 +60,8 @@ Index: linux-compile.git/arch/x86/kernel/setup64.c int cpu = stack_smp_processor_id(); struct tss_struct *t = &per_cpu(init_tss, cpu); Index: linux-compile.git/arch/x86/kernel/smpboot_64.c -=================================--- linux-compile.git.orig/arch/x86/kernel/smpboot_64.c 2007-12-19 21:44:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/smpboot_64.c 2007-12-19 21:44:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/smpboot_64.c 2007-12-20 00:49:57.000000000 -0500 @@ -317,7 +317,7 @@ static inline void set_cpu_sibling_map(i /* @@ -69,7 +73,8 @@ Index: linux-compile.git/arch/x86/kernel/smpboot_64.c /* * Dont put anything before smp_callin(), SMP Index: linux-compile.git/arch/x86/kernel/tsc_64.c -=================================--- linux-compile.git.orig/arch/x86/kernel/tsc_64.c 2007-12-19 21:44:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/tsc_64.c 2007-12-19 21:44:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/tsc_64.c 2007-12-20 00:49:57.000000000 -0500 @@ -248,13 +248,13 @@ __setup("notsc", notsc_setup); @@ -88,7 +93,8 @@ Index: linux-compile.git/arch/x86/kernel/tsc_64.c cycle_t ret = (cycle_t)get_cycles_sync(); return ret; Index: linux-compile.git/arch/x86/kernel/vsyscall_64.c -=================================--- linux-compile.git.orig/arch/x86/kernel/vsyscall_64.c 2007-12-19 21:44:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/vsyscall_64.c 2007-12-19 21:44:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/vsyscall_64.c 2007-12-20 00:54:53.000000000 -0500 @@ -42,7 +42,8 @@ #include <asm/topology.h> diff --git a/a/content_digest b/N1/content_digest index 6cabe80..008ab79 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020080103071609.478486470@goodmis.org\0" "From\0Steven Rostedt <rostedt@goodmis.org>\0" "Subject\0[RFC PATCH 05/11] x86_64: notrace annotations\0" - "Date\0Thu, 03 Jan 2008 07:16:14 +0000\0" + "Date\0Thu, 03 Jan 2008 02:16:14 -0500\0" "To\0LKML <linux-kernel@vger.kernel.org>\0" "Cc\0Ingo Molnar <mingo@elte.hu>" Linus Torvalds <torvalds@linux-foundation.org> @@ -14,6 +14,7 @@ William L. Irwin <sparclinux@vger.kernel.org> " Steven Rostedt <srostedt@redhat.com>\0" "\00:1\0" + "fn\0mcount-add-x86_64-notrace-annotations.patch\0" "b\0" "Add \"notrace\" annotation to x86_64 specific files.\n" "\n" @@ -29,7 +30,8 @@ " 6 files changed, 9 insertions(+), 8 deletions(-)\n" "\n" "Index: linux-compile.git/arch/x86/kernel/head64.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/head64.c\t2007-12-19 21:44:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/head64.c\t2007-12-19 21:44:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/head64.c\t2007-12-20 00:52:47.000000000 -0500\n" "@@ -46,7 +46,7 @@ static void __init copy_bootdata(char *r\n" " \t}\n" @@ -41,7 +43,8 @@ " \tint i;\n" " \n" "Index: linux-compile.git/arch/x86/kernel/nmi_64.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/nmi_64.c\t2007-12-19 21:44:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/nmi_64.c\t2007-12-19 21:44:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/nmi_64.c\t2007-12-20 00:51:50.000000000 -0500\n" "@@ -314,7 +314,7 @@ void touch_nmi_watchdog(void)\n" " \ttouch_softlockup_watchdog();\n" @@ -53,7 +56,8 @@ " \tint sum;\n" " \tint touched = 0;\n" "Index: linux-compile.git/arch/x86/kernel/setup64.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/setup64.c\t2007-12-19 21:44:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/setup64.c\t2007-12-19 21:44:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/setup64.c\t2007-12-20 00:52:32.000000000 -0500\n" "@@ -114,7 +114,7 @@ void __init setup_per_cpu_areas(void)\n" " \t}\n" @@ -74,7 +78,8 @@ " \tint cpu = stack_smp_processor_id();\n" " \tstruct tss_struct *t = &per_cpu(init_tss, cpu);\n" "Index: linux-compile.git/arch/x86/kernel/smpboot_64.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/smpboot_64.c\t2007-12-19 21:44:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/smpboot_64.c\t2007-12-19 21:44:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/smpboot_64.c\t2007-12-20 00:49:57.000000000 -0500\n" "@@ -317,7 +317,7 @@ static inline void set_cpu_sibling_map(i\n" " /*\n" @@ -86,7 +91,8 @@ " \t/*\n" " \t * Dont put anything before smp_callin(), SMP\n" "Index: linux-compile.git/arch/x86/kernel/tsc_64.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/tsc_64.c\t2007-12-19 21:44:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/tsc_64.c\t2007-12-19 21:44:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/tsc_64.c\t2007-12-20 00:49:57.000000000 -0500\n" "@@ -248,13 +248,13 @@ __setup(\"notsc\", notsc_setup);\n" " \n" @@ -105,7 +111,8 @@ " \tcycle_t ret = (cycle_t)get_cycles_sync();\n" " \treturn ret;\n" "Index: linux-compile.git/arch/x86/kernel/vsyscall_64.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/vsyscall_64.c\t2007-12-19 21:44:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/vsyscall_64.c\t2007-12-19 21:44:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/vsyscall_64.c\t2007-12-20 00:54:53.000000000 -0500\n" "@@ -42,7 +42,8 @@\n" " #include <asm/topology.h>\n" @@ -120,4 +127,4 @@ "\n" -- -cfacb3dd0006effaf8065f57fefae6d34c204760545349805f17b1e4cb0616e8 +c667abe78a7c8939fcf8041198ec0e7c920b4afee3d78f51f4ee4d0749565426
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.