diff for duplicates of <20050712215101.A9616@unix-os.sc.intel.com> diff --git a/a/1.txt b/N1/1.txt index 92089f5..d151e44 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,11 +27,13 @@ This patch applies on top of "Prasanna S Panchamukhi's" recent postings Kprobes: Prevent possible race condition ia64 changes Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> -=================================== arch/ia64/kernel/kprobes.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ +======================================================================= + arch/ia64/kernel/kprobes.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+) Index: linux-2.6.13-rc2-mm2/arch/ia64/kernel/kprobes.c -=================================--- linux-2.6.13-rc2-mm2.orig/arch/ia64/kernel/kprobes.c +=================================================================== +--- linux-2.6.13-rc2-mm2.orig/arch/ia64/kernel/kprobes.c +++ linux-2.6.13-rc2-mm2/arch/ia64/kernel/kprobes.c @@ -545,6 +545,38 @@ static void prepare_ss(struct kprobe *p, ia64_psr(regs)->ss = 1; @@ -49,7 +51,7 @@ Index: linux-2.6.13-rc2-mm2/arch/ia64/kernel/kprobes.c + template = bundle.quad0.template; + + /* Move to slot 2, if bundle is MLX type and kprobe slot is 1 */ -+ if (slot = 1 && bundle_encoding[template][1] = L) ++ if (slot == 1 && bundle_encoding[template][1] == L) + slot++; + + /* Get Kprobe probe instruction at given slot*/ diff --git a/a/content_digest b/N1/content_digest index 41e13ee..464cd7e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020050712190231.789da83c.akpm@osdl.org\0" "From\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" "Subject\0Re: [PATCH]Kprobes IA64 - Fix race when break hits and kprobe not found\0" - "Date\0Wed, 13 Jul 2005 04:51:02 +0000\0" + "Date\0Tue, 12 Jul 2005 21:51:02 -0700\0" "To\0Andrew Morton <akpm@osdl.org>\0" "Cc\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>" linux-kernel@vger.kernel.org @@ -39,11 +39,13 @@ "Kprobes: Prevent possible race condition ia64 changes\n" "\n" "Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>\n" - "=================================== arch/ia64/kernel/kprobes.c | 45 +++++++++++++++++++++++++++++++++++++++++++++\n" + "=======================================================================\n" + " arch/ia64/kernel/kprobes.c | 45 +++++++++++++++++++++++++++++++++++++++++++++\n" " 1 files changed, 45 insertions(+)\n" "\n" "Index: linux-2.6.13-rc2-mm2/arch/ia64/kernel/kprobes.c\n" - "=================================--- linux-2.6.13-rc2-mm2.orig/arch/ia64/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc2-mm2.orig/arch/ia64/kernel/kprobes.c\n" "+++ linux-2.6.13-rc2-mm2/arch/ia64/kernel/kprobes.c\n" "@@ -545,6 +545,38 @@ static void prepare_ss(struct kprobe *p,\n" " \tia64_psr(regs)->ss = 1;\n" @@ -61,7 +63,7 @@ "+\ttemplate = bundle.quad0.template;\n" "+\n" "+\t/* Move to slot 2, if bundle is MLX type and kprobe slot is 1 */\n" - "+ \tif (slot = 1 && bundle_encoding[template][1] = L)\n" + "+ \tif (slot == 1 && bundle_encoding[template][1] == L)\n" "+ \t\tslot++;\n" "+\n" "+\t/* Get Kprobe probe instruction at given slot*/\n" @@ -104,4 +106,4 @@ " \t\tgoto no_kprobe;\n" " \t}" -ee3aa92387a79f3b53e206125ac75bb27656e2ea0357d95e6041ed692eb29904 +15f2a53071229d3c9ad20664542363e39899e54069edb1d12c75a21cd7ba576d
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.