diff for duplicates of <20050624114545.A4826@unix-os.sc.intel.com> diff --git a/a/1.txt b/N1/1.txt index dcee4ab..b451af8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,13 +15,15 @@ now checking based on .text.ivt 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 @@ -263,6 +263,14 @@ static inline void get_kprobe_inst(bundl } @@ -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 d1a88b3..f96dfed 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\017083.25625.991516.736507@napali.hpl.hp.com\0" "From\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" "Subject\0Re: [patch][ia64]Refuse kprobe on ivt code\0" - "Date\0Fri, 24 Jun 2005 18:45:46 +0000\0" + "Date\0Fri, 24 Jun 2005 11:45:46 -0700\0" "To\0davidm@hpl.hp.com\0" "Cc\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>" akpm@osdl.org @@ -27,13 +27,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" "@@ -263,6 +263,14 @@ static inline void get_kprobe_inst(bundl\n" " \t}\n" @@ -49,7 +51,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" @@ -60,11 +62,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" @@ -88,7 +91,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" @@ -98,4 +102,4 @@ " \n" #endif /* _ASM_IA64_SECTIONS_H */ -8c7c9ceba26efc77775d543030600562d7105188b8506b786451c15a7afe533b +346b347ba9e75b81dc6fe8ecefc4cc245d8330d714616f6f784a435e20fd5380
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.