diff for duplicates of <20080103072227.246140689@goodmis.org> diff --git a/a/1.txt b/N1/1.txt index 94fa962..a251a9f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,4 +1,4 @@ -From patch-2.6.21.5-rt20. Annotates functions that should not be profiler +>From patch-2.6.21.5-rt20. Annotates functions that should not be profiler instrumented, i.e. where mcount should not be called at function entry. Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> @@ -19,7 +19,8 @@ Signed-off-by: Steven Rostedt <srostedt@redhat.com> --- Index: linux-compile.git/arch/x86/kernel/apic_32.c -=================================--- linux-compile.git.orig/arch/x86/kernel/apic_32.c 2008-01-02 22:53:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/apic_32.c 2008-01-02 22:53:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/apic_32.c 2008-01-02 22:56:41.000000000 -0500 @@ -577,7 +577,7 @@ static void local_apic_timer_interrupt(v * interrupt as well. Thus we cannot inline the local irq ... ] @@ -31,7 +32,8 @@ Index: linux-compile.git/arch/x86/kernel/apic_32.c struct pt_regs *old_regs = set_irq_regs(regs); Index: linux-compile.git/arch/x86/kernel/hpet.c -=================================--- linux-compile.git.orig/arch/x86/kernel/hpet.c 2008-01-02 22:53:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/hpet.c 2008-01-02 22:53:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/hpet.c 2008-01-02 22:56:41.000000000 -0500 @@ -295,7 +295,7 @@ static int hpet_legacy_next_event(unsign /* @@ -43,7 +45,8 @@ Index: linux-compile.git/arch/x86/kernel/hpet.c return (cycle_t)hpet_readl(HPET_COUNTER); } Index: linux-compile.git/arch/x86/kernel/irq_32.c -=================================--- linux-compile.git.orig/arch/x86/kernel/irq_32.c 2008-01-02 22:56:34.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/irq_32.c 2008-01-02 22:56:34.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/irq_32.c 2008-01-02 22:56:41.000000000 -0500 @@ -66,7 +66,7 @@ static union irq_ctx *softirq_ctx[NR_CPU * SMP cross-CPU interrupts have their own specific @@ -55,7 +58,8 @@ Index: linux-compile.git/arch/x86/kernel/irq_32.c struct pt_regs *old_regs; /* high bit used in ret_from_ code */ Index: linux-compile.git/arch/x86/kernel/nmi_32.c -=================================--- linux-compile.git.orig/arch/x86/kernel/nmi_32.c 2008-01-02 22:53:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/nmi_32.c 2008-01-02 22:53:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/nmi_32.c 2008-01-02 22:57:52.000000000 -0500 @@ -323,7 +323,7 @@ EXPORT_SYMBOL(touch_nmi_watchdog); @@ -67,7 +71,8 @@ Index: linux-compile.git/arch/x86/kernel/nmi_32.c /* Index: linux-compile.git/arch/x86/kernel/smp_32.c -=================================--- linux-compile.git.orig/arch/x86/kernel/smp_32.c 2008-01-02 22:53:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/smp_32.c 2008-01-02 22:53:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/smp_32.c 2008-01-02 22:56:41.000000000 -0500 @@ -638,7 +638,7 @@ static void native_smp_send_stop(void) * all the work is done automatically when @@ -79,7 +84,8 @@ Index: linux-compile.git/arch/x86/kernel/smp_32.c ack_APIC_irq(); __get_cpu_var(irq_stat).irq_resched_count++; Index: linux-compile.git/arch/x86/kernel/time_32.c -=================================--- linux-compile.git.orig/arch/x86/kernel/time_32.c 2008-01-02 22:53:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/time_32.c 2008-01-02 22:53:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/time_32.c 2008-01-02 22:56:41.000000000 -0500 @@ -122,7 +122,7 @@ static int set_rtc_mmss(unsigned long no @@ -91,7 +97,8 @@ Index: linux-compile.git/arch/x86/kernel/time_32.c unsigned long pc = instruction_pointer(regs); Index: linux-compile.git/arch/x86/kernel/traps_32.c -=================================--- linux-compile.git.orig/arch/x86/kernel/traps_32.c 2008-01-02 22:53:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/traps_32.c 2008-01-02 22:53:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/traps_32.c 2008-01-02 22:58:19.000000000 -0500 @@ -723,7 +723,7 @@ void __kprobes die_nmi(struct pt_regs *r do_exit(SIGSEGV); @@ -112,7 +119,8 @@ Index: linux-compile.git/arch/x86/kernel/traps_32.c int cpu; Index: linux-compile.git/arch/x86/kernel/tsc_32.c -=================================--- linux-compile.git.orig/arch/x86/kernel/tsc_32.c 2008-01-02 22:53:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/kernel/tsc_32.c 2008-01-02 22:53:52.000000000 -0500 +++ linux-compile.git/arch/x86/kernel/tsc_32.c 2008-01-02 22:56:41.000000000 -0500 @@ -269,7 +269,7 @@ core_initcall(cpufreq_tsc); @@ -124,7 +132,8 @@ Index: linux-compile.git/arch/x86/kernel/tsc_32.c cycle_t ret; Index: linux-compile.git/arch/x86/lib/delay_32.c -=================================--- linux-compile.git.orig/arch/x86/lib/delay_32.c 2008-01-02 22:53:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/lib/delay_32.c 2008-01-02 22:53:52.000000000 -0500 +++ linux-compile.git/arch/x86/lib/delay_32.c 2008-01-02 22:56:41.000000000 -0500 @@ -24,7 +24,7 @@ #endif @@ -154,11 +163,12 @@ Index: linux-compile.git/arch/x86/lib/delay_32.c delay_fn(loops); } Index: linux-compile.git/arch/x86/mm/fault_32.c -=================================--- linux-compile.git.orig/arch/x86/mm/fault_32.c 2008-01-02 22:53:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/mm/fault_32.c 2008-01-02 22:53:52.000000000 -0500 +++ linux-compile.git/arch/x86/mm/fault_32.c 2008-01-02 22:56:41.000000000 -0500 @@ -293,8 +293,8 @@ int show_unhandled_signals = 1; - * bit 3 = 1 means use of reserved bit detected - * bit 4 = 1 means fault was an instruction fetch + * bit 3 == 1 means use of reserved bit detected + * bit 4 == 1 means fault was an instruction fetch */ -fastcall void __kprobes do_page_fault(struct pt_regs *regs, - unsigned long error_code) @@ -168,7 +178,8 @@ Index: linux-compile.git/arch/x86/mm/fault_32.c struct task_struct *tsk; struct mm_struct *mm; Index: linux-compile.git/arch/x86/mm/init_32.c -=================================--- linux-compile.git.orig/arch/x86/mm/init_32.c 2008-01-02 22:53:52.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/arch/x86/mm/init_32.c 2008-01-02 22:53:52.000000000 -0500 +++ linux-compile.git/arch/x86/mm/init_32.c 2008-01-02 22:56:41.000000000 -0500 @@ -200,7 +200,7 @@ static inline int page_kills_ppro(unsign return 0; diff --git a/a/content_digest b/N1/content_digest index 1900aec..f39073e 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 04/11] i386: notrace annotations\0" - "Date\0Thu, 03 Jan 2008 07:16:13 +0000\0" + "Date\0Thu, 03 Jan 2008 02:16:13 -0500\0" "To\0LKML <linux-kernel@vger.kernel.org>\0" "Cc\0Ingo Molnar <mingo@elte.hu>" Linus Torvalds <torvalds@linux-foundation.org> @@ -14,8 +14,9 @@ William L. Irwin <sparclinux@vger.kernel.org> " Steven Rostedt <srostedt@redhat.com>\0" "\00:1\0" + "fn\0mcount-add-i386-notrace-annotations.patch\0" "b\0" - "From patch-2.6.21.5-rt20. Annotates functions that should not be profiler\n" + ">From patch-2.6.21.5-rt20. Annotates functions that should not be profiler\n" "instrumented, i.e. where mcount should not be called at function entry.\n" "\n" "Signed-off-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>\n" @@ -36,7 +37,8 @@ "---\n" "\n" "Index: linux-compile.git/arch/x86/kernel/apic_32.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/apic_32.c\t2008-01-02 22:53:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/apic_32.c\t2008-01-02 22:53:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/apic_32.c\t2008-01-02 22:56:41.000000000 -0500\n" "@@ -577,7 +577,7 @@ static void local_apic_timer_interrupt(v\n" " * interrupt as well. Thus we cannot inline the local irq ... ]\n" @@ -48,7 +50,8 @@ " \tstruct pt_regs *old_regs = set_irq_regs(regs);\n" " \n" "Index: linux-compile.git/arch/x86/kernel/hpet.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/hpet.c\t2008-01-02 22:53:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/hpet.c\t2008-01-02 22:53:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/hpet.c\t2008-01-02 22:56:41.000000000 -0500\n" "@@ -295,7 +295,7 @@ static int hpet_legacy_next_event(unsign\n" " /*\n" @@ -60,7 +63,8 @@ " \treturn (cycle_t)hpet_readl(HPET_COUNTER);\n" " }\n" "Index: linux-compile.git/arch/x86/kernel/irq_32.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/irq_32.c\t2008-01-02 22:56:34.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/irq_32.c\t2008-01-02 22:56:34.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/irq_32.c\t2008-01-02 22:56:41.000000000 -0500\n" "@@ -66,7 +66,7 @@ static union irq_ctx *softirq_ctx[NR_CPU\n" " * SMP cross-CPU interrupts have their own specific\n" @@ -72,7 +76,8 @@ " \tstruct pt_regs *old_regs;\n" " \t/* high bit used in ret_from_ code */\n" "Index: linux-compile.git/arch/x86/kernel/nmi_32.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/nmi_32.c\t2008-01-02 22:53:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/nmi_32.c\t2008-01-02 22:53:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/nmi_32.c\t2008-01-02 22:57:52.000000000 -0500\n" "@@ -323,7 +323,7 @@ EXPORT_SYMBOL(touch_nmi_watchdog);\n" " \n" @@ -84,7 +89,8 @@ " \n" " \t/*\n" "Index: linux-compile.git/arch/x86/kernel/smp_32.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/smp_32.c\t2008-01-02 22:53:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/smp_32.c\t2008-01-02 22:53:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/smp_32.c\t2008-01-02 22:56:41.000000000 -0500\n" "@@ -638,7 +638,7 @@ static void native_smp_send_stop(void)\n" " * all the work is done automatically when\n" @@ -96,7 +102,8 @@ " \tack_APIC_irq();\n" " \t__get_cpu_var(irq_stat).irq_resched_count++;\n" "Index: linux-compile.git/arch/x86/kernel/time_32.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/time_32.c\t2008-01-02 22:53:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/time_32.c\t2008-01-02 22:53:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/time_32.c\t2008-01-02 22:56:41.000000000 -0500\n" "@@ -122,7 +122,7 @@ static int set_rtc_mmss(unsigned long no\n" " \n" @@ -108,7 +115,8 @@ " \tunsigned long pc = instruction_pointer(regs);\n" " \n" "Index: linux-compile.git/arch/x86/kernel/traps_32.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/traps_32.c\t2008-01-02 22:53:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/traps_32.c\t2008-01-02 22:53:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/traps_32.c\t2008-01-02 22:58:19.000000000 -0500\n" "@@ -723,7 +723,7 @@ void __kprobes die_nmi(struct pt_regs *r\n" " \tdo_exit(SIGSEGV);\n" @@ -129,7 +137,8 @@ " \tint cpu;\n" " \n" "Index: linux-compile.git/arch/x86/kernel/tsc_32.c\n" - "=================================--- linux-compile.git.orig/arch/x86/kernel/tsc_32.c\t2008-01-02 22:53:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/kernel/tsc_32.c\t2008-01-02 22:53:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/kernel/tsc_32.c\t2008-01-02 22:56:41.000000000 -0500\n" "@@ -269,7 +269,7 @@ core_initcall(cpufreq_tsc);\n" " \n" @@ -141,7 +150,8 @@ " \tcycle_t ret;\n" " \n" "Index: linux-compile.git/arch/x86/lib/delay_32.c\n" - "=================================--- linux-compile.git.orig/arch/x86/lib/delay_32.c\t2008-01-02 22:53:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/lib/delay_32.c\t2008-01-02 22:53:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/lib/delay_32.c\t2008-01-02 22:56:41.000000000 -0500\n" "@@ -24,7 +24,7 @@\n" " #endif\n" @@ -171,11 +181,12 @@ " \tdelay_fn(loops);\n" " }\n" "Index: linux-compile.git/arch/x86/mm/fault_32.c\n" - "=================================--- linux-compile.git.orig/arch/x86/mm/fault_32.c\t2008-01-02 22:53:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/mm/fault_32.c\t2008-01-02 22:53:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/mm/fault_32.c\t2008-01-02 22:56:41.000000000 -0500\n" "@@ -293,8 +293,8 @@ int show_unhandled_signals = 1;\n" - " *\tbit 3 = 1 means use of reserved bit detected\n" - " *\tbit 4 = 1 means fault was an instruction fetch\n" + " *\tbit 3 == 1 means use of reserved bit detected\n" + " *\tbit 4 == 1 means fault was an instruction fetch\n" " */\n" "-fastcall void __kprobes do_page_fault(struct pt_regs *regs,\n" "-\t\t\t\t unsigned long error_code)\n" @@ -185,7 +196,8 @@ " \tstruct task_struct *tsk;\n" " \tstruct mm_struct *mm;\n" "Index: linux-compile.git/arch/x86/mm/init_32.c\n" - "=================================--- linux-compile.git.orig/arch/x86/mm/init_32.c\t2008-01-02 22:53:52.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/arch/x86/mm/init_32.c\t2008-01-02 22:53:52.000000000 -0500\n" "+++ linux-compile.git/arch/x86/mm/init_32.c\t2008-01-02 22:56:41.000000000 -0500\n" "@@ -200,7 +200,7 @@ static inline int page_kills_ppro(unsign\n" " \treturn 0;\n" @@ -199,4 +211,4 @@ "\n" -- -5a2c4d9a919ab77630c055ddd16cfcfb7b073c18bb708c740383470b63613408 +95d76909ac3fc6d5ae25d51079704d2fdca81bdc1536b45446ba3146a04329dc
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.