From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754991AbXIQTXR (ORCPT ); Mon, 17 Sep 2007 15:23:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757748AbXIQTVy (ORCPT ); Mon, 17 Sep 2007 15:21:54 -0400 Received: from smtp.polymtl.ca ([132.207.4.11]:57501 "EHLO smtp.polymtl.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757679AbXIQTVx (ORCPT ); Mon, 17 Sep 2007 15:21:53 -0400 Message-Id: <20070917184210.454982104@polymtl.ca> References: <20070917184031.211525416@polymtl.ca> User-Agent: quilt/0.46-1 Date: Mon, 17 Sep 2007 14:40:39 -0400 From: Mathieu Desnoyers To: akpm@linux-foundation.org, linux-kernel@vger.kernel.org Cc: Mathieu Desnoyers , Andi Kleen , prasanna@in.ibm.com, ananth@in.ibm.com, anil.s.keshavamurthy@intel.com, davem@davemloft.net Subject: [patch 08/11] Text Edit Lock - kprobes i386 Content-Disposition: inline; filename=text-edit-lock-kprobes-i386.patch X-Poly-FromMTA: (dijkstra.casi.polymtl.ca [132.207.72.10]) at Mon, 17 Sep 2007 19:21:33 +0000 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Make kprobes use text_set instead of text_poke. Signed-off-by: Mathieu Desnoyers CC: Andi Kleen CC: prasanna@in.ibm.com CC: ananth@in.ibm.com CC: anil.s.keshavamurthy@intel.com CC: davem@davemloft.net --- arch/i386/kernel/kprobes.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: linux-2.6-lttng/arch/i386/kernel/kprobes.c =================================================================== --- linux-2.6-lttng.orig/arch/i386/kernel/kprobes.c 2007-09-11 15:47:50.000000000 -0400 +++ linux-2.6-lttng/arch/i386/kernel/kprobes.c 2007-09-11 15:48:52.000000000 -0400 @@ -177,12 +177,13 @@ int __kprobes arch_prepare_kprobe(struct void __kprobes arch_arm_kprobe(struct kprobe *p) { - text_poke(p->addr, ((unsigned char []){BREAKPOINT_INSTRUCTION}), 1); + text_poke(p->addr, INIT_ARRAY(unsigned char, BREAKPOINT_INSTRUCTION, 1), + 1); } void __kprobes arch_disarm_kprobe(struct kprobe *p) { - text_poke(p->addr, &p->opcode, 1); + text_poke(p->addr, INIT_ARRAY(unsigned char, p->opcode, 1), 1); } void __kprobes arch_remove_kprobe(struct kprobe *p) -- Mathieu Desnoyers Computer Engineering Ph.D. Student, Ecole Polytechnique de Montreal OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F BA06 3F25 A8FE 3BAE 9A68