From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8511 invoked by alias); 19 Dec 2007 05:27:18 -0000 Received: (qmail 8502 invoked by uid 22791); 19 Dec 2007 05:27:17 -0000 X-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00,DK_POLICY_SIGNSOME,DK_SIGNED,SPF_PASS X-Spam-Check-By: sourceware.org Received: from rv-out-0910.google.com (HELO rv-out-0910.google.com) (209.85.198.184) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 19 Dec 2007 05:27:11 +0000 Received: by rv-out-0910.google.com with SMTP id l15so2575404rvb.50 for ; Tue, 18 Dec 2007 21:27:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc:in-reply-to:references:content-type:date:message-id:mime-version:x-mailer:content-transfer-encoding; bh=4Xp3kvGX+l/piAlwVumQk7e15hZu+RJoIG8gjcU9XUE=; b=IxfgSse5NZS6VNK2iRJLaskeAGHNHsQkIryVI09O1v0rZgWOgnHJ4HNFlDXHlYGkC6eGomCib9vKXnH7TJNb5okwgUKEIy8GQCV62Y/TP0Lz2GxILUol/C/QZKtOv2wLS6ONw2DSSGeBERExFTD3LsXSgW1IsHVEIpHgQbefMz8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date:message-id:mime-version:x-mailer:content-transfer-encoding; b=Mii8DMvK1oxHfvcpu7eUeKkhKHDRNrqn49u7jWQGfFrmAbTzVVO4ujJvU5c62bBCh+ep16Y40pt4eJM0Ts4cLbZKJcrNA/7N26BeSg0mqmQhQNconb7SsjQXjaP/mxwMyUI0qTObI6ZolfCMiX8hNEEhmdOAyxNL9i8q5xuCey8= Received: by 10.141.145.11 with SMTP id x11mr5590867rvn.264.1198042027353; Tue, 18 Dec 2007 21:27:07 -0800 (PST) Received: from ?192.168.1.100? ( [216.19.190.48]) by mx.google.com with ESMTPS id f13sm5701712rvb.2007.12.18.21.27.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 18 Dec 2007 21:27:06 -0800 (PST) Subject: [PATCH] x86: __kprobes annotations From: Harvey Harrison To: Masami Hiramatsu Cc: Ingo Molnar , Ananth N Mavinakayanahalli , Jim Keniston , Roland McGrath , Arjan van de Ven , prasanna@in.ibm.com, anil.s.keshavamurthy@intel.com, davem@davemloft.net, systemtap-ml , LKML , Andrew Morton In-Reply-To: <4767D02C.6030704@redhat.com> References: <1197930464.23402.112.camel@brick> <20071218112936.GE9002@elte.hu> <1197978160.7734.31.camel@brick> <4767D02C.6030704@redhat.com> Content-Type: text/plain Date: Wed, 19 Dec 2007 05:27:00 -0000 Message-Id: <1198042025.10357.4.camel@brick> Mime-Version: 1.0 X-Mailer: Evolution 2.12.1 Content-Transfer-Encoding: 7bit Mailing-List: contact systemtap-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: systemtap-owner@sourceware.org X-SW-Source: 2007-q4/txt/msg00554.txt.bz2 __always_inline on some static functions was to ensure they ended up in the .kprobes.text section. Mark this explicitly. Signed-off-by: Harvey Harrison --- arch/x86/kernel/kprobes.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c index c7a26be..521a469 100644 --- a/arch/x86/kernel/kprobes.c +++ b/arch/x86/kernel/kprobes.c @@ -159,7 +159,7 @@ struct kretprobe_blackpoint kretprobe_blacklist[] = { const int kretprobe_blacklist_size = ARRAY_SIZE(kretprobe_blacklist); /* Insert a jump instruction at address 'from', which jumps to address 'to'.*/ -static void set_jmp_op(void *from, void *to) +static void __kprobes set_jmp_op(void *from, void *to) { struct __arch_jmp_op { char op; @@ -174,7 +174,7 @@ static void set_jmp_op(void *from, void *to) * Returns non-zero if opcode is boostable. * RIP relative instructions are adjusted at copying time in 64 bits mode */ -static int can_boost(kprobe_opcode_t *opcodes) +static int __kprobes can_boost(kprobe_opcode_t *opcodes) { kprobe_opcode_t opcode; kprobe_opcode_t *orig_opcodes = opcodes; @@ -392,13 +392,13 @@ static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs, kcb->kprobe_saved_flags &= ~X86_EFLAGS_IF; } -static void clear_btf(void) +static void __kprobes clear_btf(void) { if (test_thread_flag(TIF_DEBUGCTLMSR)) wrmsr(MSR_IA32_DEBUGCTLMSR, 0, 0); } -static void restore_btf(void) +static void __kprobes restore_btf(void) { if (test_thread_flag(TIF_DEBUGCTLMSR)) wrmsr(MSR_IA32_DEBUGCTLMSR, current->thread.debugctlmsr, 0); -- 1.5.4.rc0.1143.g1a8a