diff for duplicates of <20110121203642.884088920@efficios.com> diff --git a/a/1.txt b/N1/1.txt index dfc16e9..9f33940 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -51,7 +51,8 @@ CC: Ingo Molnar <mingo@elte.hu> 8 files changed, 29 insertions(+), 30 deletions(-) Index: linux-2.6-lttng/include/linux/compiler.h -=================================--- linux-2.6-lttng.orig/include/linux/compiler.h +=================================================================== +--- linux-2.6-lttng.orig/include/linux/compiler.h +++ linux-2.6-lttng/include/linux/compiler.h @@ -80,7 +80,7 @@ struct ftrace_branch_data { }; @@ -81,7 +82,8 @@ Index: linux-2.6-lttng/include/linux/compiler.h ______f = { \ .func = __func__, \ Index: linux-2.6-lttng/include/linux/syscalls.h -=================================--- linux-2.6-lttng.orig/include/linux/syscalls.h +=================================================================== +--- linux-2.6-lttng.orig/include/linux/syscalls.h +++ linux-2.6-lttng/include/linux/syscalls.h @@ -126,12 +126,11 @@ extern struct trace_event_functions exit @@ -134,7 +136,8 @@ Index: linux-2.6-lttng/include/linux/syscalls.h __syscall_meta__##sname = { \ .name = "sys_"#sname, \ Index: linux-2.6-lttng/include/trace/ftrace.h -=================================--- linux-2.6-lttng.orig/include/trace/ftrace.h +=================================================================== +--- linux-2.6-lttng.orig/include/trace/ftrace.h +++ linux-2.6-lttng/include/trace/ftrace.h @@ -69,7 +69,7 @@ #undef DEFINE_EVENT @@ -173,7 +176,8 @@ Index: linux-2.6-lttng/include/trace/ftrace.h .name = #call, \ .class = &event_class_##template, \ Index: linux-2.6-lttng/kernel/trace/trace.h -=================================--- linux-2.6-lttng.orig/kernel/trace/trace.h +=================================================================== +--- linux-2.6-lttng.orig/kernel/trace/trace.h +++ linux-2.6-lttng/kernel/trace/trace.h @@ -749,7 +749,7 @@ extern const char *__stop___trace_bprint #undef FTRACE_ENTRY @@ -185,7 +189,8 @@ Index: linux-2.6-lttng/kernel/trace/trace.h #define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print) \ FTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print)) Index: linux-2.6-lttng/kernel/trace/trace_export.c -=================================--- linux-2.6-lttng.orig/kernel/trace/trace_export.c +=================================================================== +--- linux-2.6-lttng.orig/kernel/trace/trace_export.c +++ linux-2.6-lttng/kernel/trace/trace_export.c @@ -156,7 +156,7 @@ struct ftrace_event_class event_class_ft }; \ @@ -197,7 +202,8 @@ Index: linux-2.6-lttng/kernel/trace/trace_export.c .name = #call, \ .event.type = etype, \ Index: linux-2.6-lttng/include/linux/ftrace_event.h -=================================--- linux-2.6-lttng.orig/include/linux/ftrace_event.h +=================================================================== +--- linux-2.6-lttng.orig/include/linux/ftrace_event.h +++ linux-2.6-lttng/include/linux/ftrace_event.h @@ -194,7 +194,7 @@ struct ftrace_event_call { int perf_refcount; @@ -209,7 +215,8 @@ Index: linux-2.6-lttng/include/linux/ftrace_event.h #define PERF_MAX_TRACE_SIZE 2048 Index: linux-2.6-lttng/include/trace/syscall.h -=================================--- linux-2.6-lttng.orig/include/trace/syscall.h +=================================================================== +--- linux-2.6-lttng.orig/include/trace/syscall.h +++ linux-2.6-lttng/include/trace/syscall.h @@ -29,7 +29,7 @@ struct syscall_metadata { @@ -221,7 +228,8 @@ Index: linux-2.6-lttng/include/trace/syscall.h #ifdef CONFIG_FTRACE_SYSCALLS extern unsigned long arch_syscall_addr(int nr); Index: linux-2.6-lttng/include/asm-generic/vmlinux.lds.h -=================================--- linux-2.6-lttng.orig/include/asm-generic/vmlinux.lds.h +=================================================================== +--- linux-2.6-lttng.orig/include/asm-generic/vmlinux.lds.h +++ linux-2.6-lttng/include/asm-generic/vmlinux.lds.h @@ -113,7 +113,8 @@ #endif diff --git a/a/content_digest b/N1/content_digest index fb104b1..6de396f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020110121203630.725922272@efficios.com\0" "From\0Mathieu Desnoyers <mathieu.desnoyers@efficios.com>\0" "Subject\0[patch 2/3] tracing: fix sparc64 alignment crash with __u64_aligned/U64_ALIGN()\0" - "Date\0Fri, 21 Jan 2011 20:36:32 +0000\0" + "Date\0Fri, 21 Jan 2011 15:36:32 -0500\0" "To\0LKML <linux-kernel@vger.kernel.org>" David Miller <davem@davemloft.net> Steven Rostedt <rostedt@goodmis.org> @@ -12,6 +12,7 @@ " sparclinux@vger.kernel.org\0" "Cc\0Mathieu Desnoyers <mathieu.desnoyers@efficios.com>\0" "\00:1\0" + "fn\0tracing-use-u64-aligned-as-type-and-variable-attribute.patch\0" "b\0" "Problem description:\n" "\n" @@ -66,7 +67,8 @@ " 8 files changed, 29 insertions(+), 30 deletions(-)\n" "\n" "Index: linux-2.6-lttng/include/linux/compiler.h\n" - "=================================--- linux-2.6-lttng.orig/include/linux/compiler.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/linux/compiler.h\n" "+++ linux-2.6-lttng/include/linux/compiler.h\n" "@@ -80,7 +80,7 @@ struct ftrace_branch_data {\n" " \t\t};\n" @@ -96,7 +98,8 @@ " \t\t\t______f = {\t\t\t\t\t\\\n" " \t\t\t\t.func = __func__,\t\t\t\\\n" "Index: linux-2.6-lttng/include/linux/syscalls.h\n" - "=================================--- linux-2.6-lttng.orig/include/linux/syscalls.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/linux/syscalls.h\n" "+++ linux-2.6-lttng/include/linux/syscalls.h\n" "@@ -126,12 +126,11 @@ extern struct trace_event_functions exit\n" " \n" @@ -149,7 +152,8 @@ " \t __syscall_meta__##sname = {\t\t\t\t\\\n" " \t\t.name \t\t= \"sys_\"#sname,\t\t\t\\\n" "Index: linux-2.6-lttng/include/trace/ftrace.h\n" - "=================================--- linux-2.6-lttng.orig/include/trace/ftrace.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/trace/ftrace.h\n" "+++ linux-2.6-lttng/include/trace/ftrace.h\n" "@@ -69,7 +69,7 @@\n" " #undef DEFINE_EVENT\n" @@ -188,7 +192,8 @@ " \t.name\t\t\t= #call,\t\t\t\t\\\n" " \t.class\t\t\t= &event_class_##template,\t\t\\\n" "Index: linux-2.6-lttng/kernel/trace/trace.h\n" - "=================================--- linux-2.6-lttng.orig/kernel/trace/trace.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/kernel/trace/trace.h\n" "+++ linux-2.6-lttng/kernel/trace/trace.h\n" "@@ -749,7 +749,7 @@ extern const char *__stop___trace_bprint\n" " #undef FTRACE_ENTRY\n" @@ -200,7 +205,8 @@ " #define FTRACE_ENTRY_DUP(call, struct_name, id, tstruct, print)\t\t\\\n" " \tFTRACE_ENTRY(call, struct_name, id, PARAMS(tstruct), PARAMS(print))\n" "Index: linux-2.6-lttng/kernel/trace/trace_export.c\n" - "=================================--- linux-2.6-lttng.orig/kernel/trace/trace_export.c\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/kernel/trace/trace_export.c\n" "+++ linux-2.6-lttng/kernel/trace/trace_export.c\n" "@@ -156,7 +156,7 @@ struct ftrace_event_class event_class_ft\n" " };\t\t\t\t\t\t\t\t\t\\\n" @@ -212,7 +218,8 @@ " \t.name\t\t\t= #call,\t\t\t\t\\\n" " \t.event.type\t\t= etype,\t\t\t\t\\\n" "Index: linux-2.6-lttng/include/linux/ftrace_event.h\n" - "=================================--- linux-2.6-lttng.orig/include/linux/ftrace_event.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/linux/ftrace_event.h\n" "+++ linux-2.6-lttng/include/linux/ftrace_event.h\n" "@@ -194,7 +194,7 @@ struct ftrace_event_call {\n" " \tint\t\t\t\tperf_refcount;\n" @@ -224,7 +231,8 @@ " #define PERF_MAX_TRACE_SIZE\t2048\n" " \n" "Index: linux-2.6-lttng/include/trace/syscall.h\n" - "=================================--- linux-2.6-lttng.orig/include/trace/syscall.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/trace/syscall.h\n" "+++ linux-2.6-lttng/include/trace/syscall.h\n" "@@ -29,7 +29,7 @@ struct syscall_metadata {\n" " \n" @@ -236,7 +244,8 @@ " #ifdef CONFIG_FTRACE_SYSCALLS\n" " extern unsigned long arch_syscall_addr(int nr);\n" "Index: linux-2.6-lttng/include/asm-generic/vmlinux.lds.h\n" - "=================================--- linux-2.6-lttng.orig/include/asm-generic/vmlinux.lds.h\n" + "===================================================================\n" + "--- linux-2.6-lttng.orig/include/asm-generic/vmlinux.lds.h\n" "+++ linux-2.6-lttng/include/asm-generic/vmlinux.lds.h\n" "@@ -113,7 +113,8 @@\n" " #endif\n" @@ -301,4 +310,4 @@ " \n" /* -de9ff727e0569c5246704a91c705ad02694457ec9da8bbed859e274c02476301 +6b11910d6760b93ac028d2fb1607685080b081c89929f5077ca9ccb986885668
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.