From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762702AbXKMSvE (ORCPT ); Tue, 13 Nov 2007 13:51:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761756AbXKMSsM (ORCPT ); Tue, 13 Nov 2007 13:48:12 -0500 Received: from smtp.polymtl.ca ([132.207.4.11]:48382 "EHLO smtp.polymtl.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761744AbXKMSsK (ORCPT ); Tue, 13 Nov 2007 13:48:10 -0500 Message-Id: <20071113184720.462291506@polymtl.ca> References: <20071113184627.667866257@polymtl.ca> User-Agent: quilt/0.46-1 Date: Tue, 13 Nov 2007 13:46:36 -0500 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 09/11] Text Edit Lock - kprobes x86_64 Content-Disposition: inline; filename=text-edit-lock-kprobes-x86_64.patch X-Poly-FromMTA: (dijkstra.casi.polymtl.ca [132.207.72.10]) at Tue, 13 Nov 2007 18:47:20 +0000 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Make kprobes use INIT_ARRAY(). Signed-off-by: Mathieu Desnoyers Tested-by: Ananth N Mavinakayanahalli CC: Andi Kleen CC: prasanna@in.ibm.com CC: ananth@in.ibm.com CC: anil.s.keshavamurthy@intel.com CC: davem@davemloft.net --- arch/x86/kernel/kprobes_64.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: linux-2.6-lttng/arch/x86/kernel/kprobes_64.c =================================================================== --- linux-2.6-lttng.orig/arch/x86/kernel/kprobes_64.c 2007-11-13 09:45:35.000000000 -0500 +++ linux-2.6-lttng/arch/x86/kernel/kprobes_64.c 2007-11-13 09:45:46.000000000 -0500 @@ -215,12 +215,13 @@ static void __kprobes arch_copy_kprobe(s 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