diff for duplicates of <20080103072227.087067007@goodmis.org> diff --git a/a/1.txt b/N1/1.txt index 67c3f3a..f16feef 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,7 +16,8 @@ Signed-off-by: Steven Rostedt <srostedt@redhat.com> 7 files changed, 24 insertions(+), 23 deletions(-) Index: linux-compile.git/drivers/clocksource/acpi_pm.c -=================================--- linux-compile.git.orig/drivers/clocksource/acpi_pm.c 2007-12-20 01:00:29.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/drivers/clocksource/acpi_pm.c 2007-12-20 01:00:29.000000000 -0500 +++ linux-compile.git/drivers/clocksource/acpi_pm.c 2007-12-20 01:00:48.000000000 -0500 @@ -30,13 +30,13 @@ */ @@ -50,7 +51,8 @@ Index: linux-compile.git/drivers/clocksource/acpi_pm.c return (cycle_t)read_pmtmr(); } Index: linux-compile.git/include/linux/preempt.h -=================================--- linux-compile.git.orig/include/linux/preempt.h 2007-12-20 01:00:29.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/include/linux/preempt.h 2007-12-20 01:00:29.000000000 -0500 +++ linux-compile.git/include/linux/preempt.h 2007-12-20 01:00:48.000000000 -0500 @@ -11,8 +11,8 @@ #include <linux/list.h> @@ -64,7 +66,8 @@ Index: linux-compile.git/include/linux/preempt.h # define add_preempt_count(val) do { preempt_count() += (val); } while (0) # define sub_preempt_count(val) do { preempt_count() -= (val); } while (0) Index: linux-compile.git/kernel/irq/handle.c -=================================--- linux-compile.git.orig/kernel/irq/handle.c 2007-12-20 01:00:29.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/kernel/irq/handle.c 2007-12-20 01:00:29.000000000 -0500 +++ linux-compile.git/kernel/irq/handle.c 2007-12-20 01:00:48.000000000 -0500 @@ -163,7 +163,7 @@ irqreturn_t handle_IRQ_event(unsigned in * This is the original x86 implementation which is used for every @@ -76,7 +79,8 @@ Index: linux-compile.git/kernel/irq/handle.c struct irq_desc *desc = irq_desc + irq; struct irqaction *action; Index: linux-compile.git/kernel/lockdep.c -=================================--- linux-compile.git.orig/kernel/lockdep.c 2007-12-20 01:00:29.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/kernel/lockdep.c 2007-12-20 01:00:29.000000000 -0500 +++ linux-compile.git/kernel/lockdep.c 2007-12-20 01:00:48.000000000 -0500 @@ -270,14 +270,14 @@ static struct list_head chainhash_table[ ((key1) >> (64-MAX_LOCKDEP_KEYS_BITS)) ^ \ @@ -182,7 +186,8 @@ Index: linux-compile.git/kernel/lockdep.c unsigned long flags; Index: linux-compile.git/kernel/rcupdate.c -=================================--- linux-compile.git.orig/kernel/rcupdate.c 2007-12-20 01:00:29.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/kernel/rcupdate.c 2007-12-20 01:00:29.000000000 -0500 +++ linux-compile.git/kernel/rcupdate.c 2007-12-20 01:00:48.000000000 -0500 @@ -504,7 +504,7 @@ static int __rcu_pending(struct rcu_ctrl * by the current CPU, returning 1 if so. This function is part of the @@ -194,7 +199,8 @@ Index: linux-compile.git/kernel/rcupdate.c return __rcu_pending(&rcu_ctrlblk, &per_cpu(rcu_data, cpu)) || __rcu_pending(&rcu_bh_ctrlblk, &per_cpu(rcu_bh_data, cpu)); Index: linux-compile.git/kernel/spinlock.c -=================================--- linux-compile.git.orig/kernel/spinlock.c 2007-12-20 01:00:29.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/kernel/spinlock.c 2007-12-20 01:00:29.000000000 -0500 +++ linux-compile.git/kernel/spinlock.c 2007-12-20 01:00:48.000000000 -0500 @@ -437,7 +437,7 @@ int __lockfunc _spin_trylock_bh(spinlock } @@ -206,7 +212,8 @@ Index: linux-compile.git/kernel/spinlock.c /* Linker adds these: start and end of __lockfunc functions */ extern char __lock_text_start[], __lock_text_end[]; Index: linux-compile.git/lib/smp_processor_id.c -=================================--- linux-compile.git.orig/lib/smp_processor_id.c 2007-12-20 01:00:29.000000000 -0500 +=================================================================== +--- linux-compile.git.orig/lib/smp_processor_id.c 2007-12-20 01:00:29.000000000 -0500 +++ linux-compile.git/lib/smp_processor_id.c 2007-12-20 01:00:48.000000000 -0500 @@ -7,7 +7,7 @@ #include <linux/kallsyms.h> diff --git a/a/content_digest b/N1/content_digest index b966279..57bf2f9 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 03/11] Annotate core code that should not be traced\0" - "Date\0Thu, 03 Jan 2008 07:16:12 +0000\0" + "Date\0Thu, 03 Jan 2008 02:16:12 -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-annotate-generic-code.patch\0" "b\0" "Mark with \"notrace\" functions in core code that should not be\n" "traced. The \"notrace\" attribute will prevent gcc from adding\n" @@ -33,7 +34,8 @@ " 7 files changed, 24 insertions(+), 23 deletions(-)\n" "\n" "Index: linux-compile.git/drivers/clocksource/acpi_pm.c\n" - "=================================--- linux-compile.git.orig/drivers/clocksource/acpi_pm.c\t2007-12-20 01:00:29.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/drivers/clocksource/acpi_pm.c\t2007-12-20 01:00:29.000000000 -0500\n" "+++ linux-compile.git/drivers/clocksource/acpi_pm.c\t2007-12-20 01:00:48.000000000 -0500\n" "@@ -30,13 +30,13 @@\n" " */\n" @@ -67,7 +69,8 @@ " \treturn (cycle_t)read_pmtmr();\n" " }\n" "Index: linux-compile.git/include/linux/preempt.h\n" - "=================================--- linux-compile.git.orig/include/linux/preempt.h\t2007-12-20 01:00:29.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/include/linux/preempt.h\t2007-12-20 01:00:29.000000000 -0500\n" "+++ linux-compile.git/include/linux/preempt.h\t2007-12-20 01:00:48.000000000 -0500\n" "@@ -11,8 +11,8 @@\n" " #include <linux/list.h>\n" @@ -81,7 +84,8 @@ " # define add_preempt_count(val)\tdo { preempt_count() += (val); } while (0)\n" " # define sub_preempt_count(val)\tdo { preempt_count() -= (val); } while (0)\n" "Index: linux-compile.git/kernel/irq/handle.c\n" - "=================================--- linux-compile.git.orig/kernel/irq/handle.c\t2007-12-20 01:00:29.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/kernel/irq/handle.c\t2007-12-20 01:00:29.000000000 -0500\n" "+++ linux-compile.git/kernel/irq/handle.c\t2007-12-20 01:00:48.000000000 -0500\n" "@@ -163,7 +163,7 @@ irqreturn_t handle_IRQ_event(unsigned in\n" " * This is the original x86 implementation which is used for every\n" @@ -93,7 +97,8 @@ " \tstruct irq_desc *desc = irq_desc + irq;\n" " \tstruct irqaction *action;\n" "Index: linux-compile.git/kernel/lockdep.c\n" - "=================================--- linux-compile.git.orig/kernel/lockdep.c\t2007-12-20 01:00:29.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/kernel/lockdep.c\t2007-12-20 01:00:29.000000000 -0500\n" "+++ linux-compile.git/kernel/lockdep.c\t2007-12-20 01:00:48.000000000 -0500\n" "@@ -270,14 +270,14 @@ static struct list_head chainhash_table[\n" " \t((key1) >> (64-MAX_LOCKDEP_KEYS_BITS)) ^ \\\n" @@ -199,7 +204,8 @@ " \tunsigned long flags;\n" " \n" "Index: linux-compile.git/kernel/rcupdate.c\n" - "=================================--- linux-compile.git.orig/kernel/rcupdate.c\t2007-12-20 01:00:29.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/kernel/rcupdate.c\t2007-12-20 01:00:29.000000000 -0500\n" "+++ linux-compile.git/kernel/rcupdate.c\t2007-12-20 01:00:48.000000000 -0500\n" "@@ -504,7 +504,7 @@ static int __rcu_pending(struct rcu_ctrl\n" " * by the current CPU, returning 1 if so. This function is part of the\n" @@ -211,7 +217,8 @@ " \treturn __rcu_pending(&rcu_ctrlblk, &per_cpu(rcu_data, cpu)) ||\n" " \t\t__rcu_pending(&rcu_bh_ctrlblk, &per_cpu(rcu_bh_data, cpu));\n" "Index: linux-compile.git/kernel/spinlock.c\n" - "=================================--- linux-compile.git.orig/kernel/spinlock.c\t2007-12-20 01:00:29.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/kernel/spinlock.c\t2007-12-20 01:00:29.000000000 -0500\n" "+++ linux-compile.git/kernel/spinlock.c\t2007-12-20 01:00:48.000000000 -0500\n" "@@ -437,7 +437,7 @@ int __lockfunc _spin_trylock_bh(spinlock\n" " }\n" @@ -223,7 +230,8 @@ " \t/* Linker adds these: start and end of __lockfunc functions */\n" " \textern char __lock_text_start[], __lock_text_end[];\n" "Index: linux-compile.git/lib/smp_processor_id.c\n" - "=================================--- linux-compile.git.orig/lib/smp_processor_id.c\t2007-12-20 01:00:29.000000000 -0500\n" + "===================================================================\n" + "--- linux-compile.git.orig/lib/smp_processor_id.c\t2007-12-20 01:00:29.000000000 -0500\n" "+++ linux-compile.git/lib/smp_processor_id.c\t2007-12-20 01:00:48.000000000 -0500\n" "@@ -7,7 +7,7 @@\n" " #include <linux/kallsyms.h>\n" @@ -237,4 +245,4 @@ "\n" -- -9c0087f50e327bc6dfcdffae9dc0d4cfe8f8b4275527469e62a1aeebe868e3d2 +53b2a86256af33fdd1293ea9203dfd9ecbdfd663fe4b468ddde42355358a11a8
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.