diff for duplicates of <20050712185230.A8528@unix-os.sc.intel.com> diff --git a/a/1.txt b/N1/1.txt index 549790b..2d3c6de 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,11 +14,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-rc1-mm1-systemtap/arch/ia64/kernel/kprobes.c -=================================--- linux-2.6.13-rc1-mm1-systemtap.orig/arch/ia64/kernel/kprobes.c +=================================================================== +--- linux-2.6.13-rc1-mm1-systemtap.orig/arch/ia64/kernel/kprobes.c +++ linux-2.6.13-rc1-mm1-systemtap/arch/ia64/kernel/kprobes.c @@ -554,6 +554,38 @@ static void __kprobes prepare_ss(struct ia64_psr(regs)->ss = 1; @@ -36,7 +38,7 @@ Index: linux-2.6.13-rc1-mm1-systemtap/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 8d46047..b0bce0c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" "Subject\0[PATCH]Kprobes IA64 - Fix race when break hits and kprobe not found\0" - "Date\0Wed, 13 Jul 2005 01:52:30 +0000\0" + "Date\0Tue, 12 Jul 2005 18:52:30 -0700\0" "To\0akpm@osdl.org\0" "Cc\0anil.s.keshavamurthy@intel.com" Linux Kernel <linux-kernel@vger.kernel.org> @@ -24,11 +24,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-rc1-mm1-systemtap/arch/ia64/kernel/kprobes.c\n" - "=================================--- linux-2.6.13-rc1-mm1-systemtap.orig/arch/ia64/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.13-rc1-mm1-systemtap.orig/arch/ia64/kernel/kprobes.c\n" "+++ linux-2.6.13-rc1-mm1-systemtap/arch/ia64/kernel/kprobes.c\n" "@@ -554,6 +554,38 @@ static void __kprobes prepare_ss(struct \n" " \tia64_psr(regs)->ss = 1;\n" @@ -46,7 +48,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" @@ -89,4 +91,4 @@ " \t\tgoto no_kprobe;\n" " \t}" -31fee731823b655348ff8e4fcd28e0b9483227f5a2b6ec46c2d4d502d5cc1619 +9224d2485c36d9bce8541a31982c4ea68f809db664b75a1ee0664f96552e2174
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.