diff for duplicates of <20080103175210.GD30582@Krystal> diff --git a/a/1.txt b/N1/1.txt index a1deeb6..e586c72 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,7 +20,8 @@ > --- > > 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 ... ] @@ -35,7 +36,8 @@ Why can't this be traced ? > 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 > /* @@ -53,7 +55,8 @@ bits counter when in fact we only have 32 bits. How long before the wrap around ? > 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 @@ -68,7 +71,8 @@ Why ? > 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); > @@ -85,7 +89,8 @@ them "notrace" or make sure your tracer is disabled when they are run. > > /* > 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 @@ -100,7 +105,8 @@ why? > 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 > @@ -112,7 +118,8 @@ why? > 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); @@ -137,7 +144,8 @@ Same here.. we must be careful, or use atomic ops instead of interrupt disabling. > 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); > @@ -149,7 +157,8 @@ disabling. > 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 @@ -179,11 +188,12 @@ disabling. > 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) @@ -198,7 +208,8 @@ trigger an mcount call ? > 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 8598921..b39cceb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020080103072227.246140689@goodmis.org\0" "From\0Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>\0" "Subject\0Re: [RFC PATCH 04/11] i386: notrace annotations\0" - "Date\0Thu, 03 Jan 2008 17:52:10 +0000\0" + "Date\0Thu, 3 Jan 2008 12:52:10 -0500\0" "To\0Steven Rostedt <rostedt@goodmis.org>\0" "Cc\0LKML <linux-kernel@vger.kernel.org>" Ingo Molnar <mingo@elte.hu> @@ -38,7 +38,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" @@ -53,7 +54,8 @@ "Why can't this be traced ?\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" @@ -71,7 +73,8 @@ "around ?\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" @@ -86,7 +89,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" @@ -103,7 +107,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" @@ -118,7 +123,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" @@ -130,7 +136,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" @@ -155,7 +162,8 @@ "disabling.\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" @@ -167,7 +175,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" @@ -197,11 +206,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" @@ -216,7 +226,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" @@ -235,4 +246,4 @@ "Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal\n" OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68 -9fba1cc18fa88496c09d740ebaa38f0bf232febbd78485fd658b1af057cd87a7 +82909c13ed5af9ea91b40906dafa7bb4f7a8c412a306dfd798f98c45cb720db5
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.