diff for duplicates of <20050523154228.407691000@csdlinux-2.jf.intel.com> diff --git a/a/1.txt b/N1/1.txt index 8dc91a8..a98416d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,8 @@ This is an IA64 arch specific handling of Kprobes signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> signed-off-by: Rusty Lynch <Rusty.lynch@intel.com> -==================================== +========================================================================= + arch/ia64/Kconfig.debug | 11 + arch/ia64/kernel/Makefile | 1 arch/ia64/kernel/kprobes.c | 332 +++++++++++++++++++++++++++++++++++++++++++++ @@ -11,7 +12,8 @@ signed-off-by: Rusty Lynch <Rusty.lynch@intel.com> 4 files changed, 414 insertions(+) Index: linux-2.6.12-rc4/arch/ia64/Kconfig.debug -=================================--- linux-2.6.12-rc4.orig/arch/ia64/Kconfig.debug 2005-05-22 23:27:22.000000000 -0700 +=================================================================== +--- linux-2.6.12-rc4.orig/arch/ia64/Kconfig.debug 2005-05-22 23:27:22.000000000 -0700 +++ linux-2.6.12-rc4/arch/ia64/Kconfig.debug 2005-05-22 23:28:12.000000000 -0700 @@ -2,6 +2,17 @@ @@ -32,7 +34,8 @@ Index: linux-2.6.12-rc4/arch/ia64/Kconfig.debug prompt "Physical memory granularity" default IA64_GRANULE_64MB Index: linux-2.6.12-rc4/arch/ia64/kernel/kprobes.c -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.12-rc4/arch/ia64/kernel/kprobes.c 2005-05-23 07:57:43.106362451 -0700 @@ -0,0 +1,332 @@ +/* @@ -131,7 +134,7 @@ Index: linux-2.6.12-rc4/arch/ia64/kernel/kprobes.c + */ + memcpy(&bundle, (unsigned long *)bundle_addr, sizeof(bundle_t)); + template = bundle.quad0.template; -+ if (((bundle_encoding[template][1] = L) && slot > 1) || (slot > 2)) { ++ if (((bundle_encoding[template][1] == L) && slot > 1) || (slot > 2)) { + printk(KERN_WARNING "Attempting to insert unaligned kprobe at 0x%lx\n", addr); + return -EINVAL; + } @@ -159,7 +162,7 @@ Index: linux-2.6.12-rc4/arch/ia64/kernel/kprobes.c + memcpy(&bundle, &p->ainsn.insn.bundle, sizeof(bundle_t)); + + template = bundle.quad0.template; -+ if (slot = 1 && bundle_encoding[template][1] = L) ++ if (slot == 1 && bundle_encoding[template][1] == L) + slot = 2; + switch (slot) { + case 0: @@ -253,7 +256,7 @@ Index: linux-2.6.12-rc4/arch/ia64/kernel/kprobes.c + if (kprobe_running()) { + p = get_kprobe(addr); + if (p) { -+ if (kprobe_status = KPROBE_HIT_SS) { ++ if (kprobe_status == KPROBE_HIT_SS) { + unlock_kprobes(); + goto no_kprobe; + } @@ -368,7 +371,8 @@ Index: linux-2.6.12-rc4/arch/ia64/kernel/kprobes.c + return 0; +} Index: linux-2.6.12-rc4/arch/ia64/kernel/Makefile -=================================--- linux-2.6.12-rc4.orig/arch/ia64/kernel/Makefile 2005-05-22 23:27:22.000000000 -0700 +=================================================================== +--- linux-2.6.12-rc4.orig/arch/ia64/kernel/Makefile 2005-05-22 23:27:22.000000000 -0700 +++ linux-2.6.12-rc4/arch/ia64/kernel/Makefile 2005-05-23 07:57:43.105385888 -0700 @@ -20,6 +20,7 @@ obj-$(CONFIG_PERFMON) += perfmon_default_smpl.o @@ -379,7 +383,8 @@ Index: linux-2.6.12-rc4/arch/ia64/kernel/Makefile # The gate DSO image is built using a special linker script. Index: linux-2.6.12-rc4/include/asm-ia64/kprobes.h -=================================--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.12-rc4/include/asm-ia64/kprobes.h 2005-05-23 07:57:43.107339013 -0700 @@ -0,0 +1,70 @@ +#ifndef _ASM_KPROBES_H diff --git a/a/content_digest b/N1/content_digest index 2bf2820..f126c49 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020050523153906.988390000@csdlinux-2.jf.intel.com\0" "From\0Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>\0" "Subject\0[patch 2/4] Kprobes support for IA64\0" - "Date\0Mon, 23 May 2005 15:39:08 +0000\0" + "Date\0Mon, 23 May 2005 08:39:08 -0700\0" "To\0akpm@osdl.org\0" "Cc\0tony.luck@intel.com" rohit.seth@intel.com @@ -13,13 +13,15 @@ linux-kernel@vger.kernel.org " anil.s.keshavamurthy@intel.com\0" "\00:1\0" + "fn\0kprobes-base-ia64-support.patch\0" "b\0" "\n" "This is an IA64 arch specific handling of Kprobes\n" "\n" "signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>\n" "signed-off-by: Rusty Lynch <Rusty.lynch@intel.com>\n" - "====================================\n" + "=========================================================================\n" + "\n" " arch/ia64/Kconfig.debug | 11 +\n" " arch/ia64/kernel/Makefile | 1 \n" " arch/ia64/kernel/kprobes.c | 332 +++++++++++++++++++++++++++++++++++++++++++++\n" @@ -27,7 +29,8 @@ " 4 files changed, 414 insertions(+)\n" "\n" "Index: linux-2.6.12-rc4/arch/ia64/Kconfig.debug\n" - "=================================--- linux-2.6.12-rc4.orig/arch/ia64/Kconfig.debug\t2005-05-22 23:27:22.000000000 -0700\n" + "===================================================================\n" + "--- linux-2.6.12-rc4.orig/arch/ia64/Kconfig.debug\t2005-05-22 23:27:22.000000000 -0700\n" "+++ linux-2.6.12-rc4/arch/ia64/Kconfig.debug\t2005-05-22 23:28:12.000000000 -0700\n" "@@ -2,6 +2,17 @@\n" " \n" @@ -48,7 +51,8 @@ " \tprompt \"Physical memory granularity\"\n" " \tdefault IA64_GRANULE_64MB\n" "Index: linux-2.6.12-rc4/arch/ia64/kernel/kprobes.c\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux-2.6.12-rc4/arch/ia64/kernel/kprobes.c\t2005-05-23 07:57:43.106362451 -0700\n" "@@ -0,0 +1,332 @@\n" "+/*\n" @@ -147,7 +151,7 @@ "+\t */\n" "+\tmemcpy(&bundle, (unsigned long *)bundle_addr, sizeof(bundle_t));\n" "+\ttemplate = bundle.quad0.template;\n" - "+\tif (((bundle_encoding[template][1] = L) && slot > 1) || (slot > 2)) {\n" + "+\tif (((bundle_encoding[template][1] == L) && slot > 1) || (slot > 2)) {\n" "+\t\tprintk(KERN_WARNING \"Attempting to insert unaligned kprobe at 0x%lx\\n\", addr);\n" "+\t\treturn -EINVAL;\n" "+\t}\n" @@ -175,7 +179,7 @@ "+\tmemcpy(&bundle, &p->ainsn.insn.bundle, sizeof(bundle_t));\n" "+\n" "+\ttemplate = bundle.quad0.template;\n" - "+\tif (slot = 1 && bundle_encoding[template][1] = L)\n" + "+\tif (slot == 1 && bundle_encoding[template][1] == L)\n" "+\t\tslot = 2;\n" "+\tswitch (slot) {\n" "+\tcase 0:\n" @@ -269,7 +273,7 @@ "+\tif (kprobe_running()) {\n" "+\t\tp = get_kprobe(addr);\n" "+\t\tif (p) {\n" - "+\t\t\tif (kprobe_status = KPROBE_HIT_SS) {\n" + "+\t\t\tif (kprobe_status == KPROBE_HIT_SS) {\n" "+\t\t\t\tunlock_kprobes();\n" "+\t\t\t\tgoto no_kprobe;\n" "+\t\t\t}\n" @@ -384,7 +388,8 @@ "+\treturn 0;\n" "+}\n" "Index: linux-2.6.12-rc4/arch/ia64/kernel/Makefile\n" - "=================================--- linux-2.6.12-rc4.orig/arch/ia64/kernel/Makefile\t2005-05-22 23:27:22.000000000 -0700\n" + "===================================================================\n" + "--- linux-2.6.12-rc4.orig/arch/ia64/kernel/Makefile\t2005-05-22 23:27:22.000000000 -0700\n" "+++ linux-2.6.12-rc4/arch/ia64/kernel/Makefile\t2005-05-23 07:57:43.105385888 -0700\n" "@@ -20,6 +20,7 @@\n" " obj-$(CONFIG_PERFMON)\t\t+= perfmon_default_smpl.o\n" @@ -395,7 +400,8 @@ " \n" " # The gate DSO image is built using a special linker script.\n" "Index: linux-2.6.12-rc4/include/asm-ia64/kprobes.h\n" - "=================================--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" + "===================================================================\n" + "--- /dev/null\t1970-01-01 00:00:00.000000000 +0000\n" "+++ linux-2.6.12-rc4/include/asm-ia64/kprobes.h\t2005-05-23 07:57:43.107339013 -0700\n" "@@ -0,0 +1,70 @@\n" "+#ifndef _ASM_KPROBES_H\n" @@ -471,4 +477,4 @@ "\n" -- -6c4d55a1c0036255db458a38a444cef20c795aed3d52be7487ad013ec534fe33 +1e7633bca23aa0aea08f193bed1bcb211d9e2a072f4c3a423a6216e9fc1029ea
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.