diff for duplicates of <20050624122333.A5213@unix-os.sc.intel.com> diff --git a/a/1.txt b/N1/1.txt index 7fb410a..3a0b6ec 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,13 +8,15 @@ Take 2: now including sections.h :-) Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> -======================= arch/ia64/kernel/kprobes.c | 14 ++++++++++++++ +=============================================== + arch/ia64/kernel/kprobes.c | 14 ++++++++++++++ arch/ia64/kernel/vmlinux.lds.S | 7 ++++++- include/asm-ia64/sections.h | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) Index: linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c -=================================--- linux-2.6.12-mm1.orig/arch/ia64/kernel/kprobes.c +=================================================================== +--- linux-2.6.12-mm1.orig/arch/ia64/kernel/kprobes.c +++ linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c @@ -34,6 +34,7 @@ @@ -37,7 +39,7 @@ Index: linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c + static int valid_kprobe_addr(int template, int slot, unsigned long addr) { - if ((slot > 2) || ((bundle_encoding[template][1] = L) && slot > 1)) { + if ((slot > 2) || ((bundle_encoding[template][1] == L) && slot > 1)) { @@ -271,6 +279,12 @@ static int valid_kprobe_addr(int templat return -EINVAL; } @@ -48,11 +50,12 @@ Index: linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c + return -EINVAL; + } + - if (slot = 1) { + if (slot == 1) { printk(KERN_WARNING "Inserting kprobes on slot #1 " "is not supported\n"); Index: linux-2.6.12-mm1/arch/ia64/kernel/vmlinux.lds.S -=================================--- linux-2.6.12-mm1.orig/arch/ia64/kernel/vmlinux.lds.S +=================================================================== +--- linux-2.6.12-mm1.orig/arch/ia64/kernel/vmlinux.lds.S +++ linux-2.6.12-mm1/arch/ia64/kernel/vmlinux.lds.S @@ -8,6 +8,11 @@ #define LOAD_OFFSET (KERNEL_START - KERNEL_TR_PAGE_SIZE) @@ -76,7 +79,8 @@ Index: linux-2.6.12-mm1/arch/ia64/kernel/vmlinux.lds.S SCHED_TEXT LOCK_TEXT Index: linux-2.6.12-mm1/include/asm-ia64/sections.h -=================================--- linux-2.6.12-mm1.orig/include/asm-ia64/sections.h +=================================================================== +--- linux-2.6.12-mm1.orig/include/asm-ia64/sections.h +++ linux-2.6.12-mm1/include/asm-ia64/sections.h @@ -17,6 +17,7 @@ extern char __start_gate_vtop_patchlist[ extern char __start_gate_fsyscall_patchlist[], __end_gate_fsyscall_patchlist[]; diff --git a/a/content_digest b/N1/content_digest index 7f11905..37b5e97 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\017084.23214.237084.224128@napali.hpl.hp.com\0" "From\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" "Subject\0[patch][ia64]Refuse kprobe on ivt code- take 2\0" - "Date\0Fri, 24 Jun 2005 19:23:33 +0000\0" + "Date\0Fri, 24 Jun 2005 12:23:33 -0700\0" "To\0davidm@hpl.hp.com\0" "Cc\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>" akpm@osdl.org @@ -22,13 +22,15 @@ "\n" "Signed-off-by: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>\n" "\n" - "======================= arch/ia64/kernel/kprobes.c | 14 ++++++++++++++\n" + "===============================================\n" + " arch/ia64/kernel/kprobes.c | 14 ++++++++++++++\n" " arch/ia64/kernel/vmlinux.lds.S | 7 ++++++-\n" " include/asm-ia64/sections.h | 1 +\n" " 3 files changed, 21 insertions(+), 1 deletion(-)\n" "\n" "Index: linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c\n" - "=================================--- linux-2.6.12-mm1.orig/arch/ia64/kernel/kprobes.c\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/arch/ia64/kernel/kprobes.c\n" "+++ linux-2.6.12-mm1/arch/ia64/kernel/kprobes.c\n" "@@ -34,6 +34,7 @@\n" " \n" @@ -51,7 +53,7 @@ "+\n" " static int valid_kprobe_addr(int template, int slot, unsigned long addr)\n" " {\n" - " \tif ((slot > 2) || ((bundle_encoding[template][1] = L) && slot > 1)) {\n" + " \tif ((slot > 2) || ((bundle_encoding[template][1] == L) && slot > 1)) {\n" "@@ -271,6 +279,12 @@ static int valid_kprobe_addr(int templat\n" " \t\treturn -EINVAL;\n" " \t}\n" @@ -62,11 +64,12 @@ "+ \t\treturn -EINVAL;\n" "+ \t}\n" "+\n" - " \tif (slot = 1) {\n" + " \tif (slot == 1) {\n" " \t\tprintk(KERN_WARNING \"Inserting kprobes on slot #1 \"\n" " \t\t \"is not supported\\n\");\n" "Index: linux-2.6.12-mm1/arch/ia64/kernel/vmlinux.lds.S\n" - "=================================--- linux-2.6.12-mm1.orig/arch/ia64/kernel/vmlinux.lds.S\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/arch/ia64/kernel/vmlinux.lds.S\n" "+++ linux-2.6.12-mm1/arch/ia64/kernel/vmlinux.lds.S\n" "@@ -8,6 +8,11 @@\n" " #define LOAD_OFFSET\t(KERNEL_START - KERNEL_TR_PAGE_SIZE)\n" @@ -90,7 +93,8 @@ " \tSCHED_TEXT\n" " \tLOCK_TEXT\n" "Index: linux-2.6.12-mm1/include/asm-ia64/sections.h\n" - "=================================--- linux-2.6.12-mm1.orig/include/asm-ia64/sections.h\n" + "===================================================================\n" + "--- linux-2.6.12-mm1.orig/include/asm-ia64/sections.h\n" "+++ linux-2.6.12-mm1/include/asm-ia64/sections.h\n" "@@ -17,6 +17,7 @@ extern char __start_gate_vtop_patchlist[\n" " extern char __start_gate_fsyscall_patchlist[], __end_gate_fsyscall_patchlist[];\n" @@ -100,4 +104,4 @@ " \n" #endif /* _ASM_IA64_SECTIONS_H */ -71f7d22c6f25f9e8321e201baf2f9dcd7f36d827813f83ba1850382ecff483f7 +bf81c03720e75adb4cf6c53407bc32871939f3454b187500353d5415dc978d62
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.