From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161063AbWASEGZ (ORCPT ); Wed, 18 Jan 2006 23:06:25 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1161065AbWASEGY (ORCPT ); Wed, 18 Jan 2006 23:06:24 -0500 Received: from e4.ny.us.ibm.com ([32.97.182.144]:15073 "EHLO e4.ny.us.ibm.com") by vger.kernel.org with ESMTP id S1161063AbWASEGY (ORCPT ); Wed, 18 Jan 2006 23:06:24 -0500 Date: Thu, 19 Jan 2006 09:35:49 +0530 From: Ananth N Mavinakayanahalli To: Adrian Bunk Cc: Andrew Morton , prasanna@in.ibm.com, anil.s.keshavamurthy@intel.com, davem@davemloft.net, linux-kernel@vger.kernel.org Subject: Re: [2.6 patch] kernel/kprobes.c: fix a warning #ifndef ARCH_SUPPORTS_KRETPROBES Message-ID: <20060119040549.GA2326@in.ibm.com> Reply-To: ananth@in.ibm.com References: <20060119021154.GD19398@stusta.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20060119021154.GD19398@stusta.de> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jan 19, 2006 at 03:11:54AM +0100, Adrian Bunk wrote: > This patch fixes the following warning #ifndef ARCH_SUPPORTS_KRETPROBES: > > <-- snip --> > > ... > CC kernel/kprobes.o > kernel/kprobes.c:353: warning: 'pre_handler_kretprobe' defined but not used > ... > > <-- snip --> > > > Signed-off-by: Adrian Bunk Acked-by: Ananth N Mavinakayanahalli Ananth > > --- > > This patch was already sent on: > - 14 Jan 2006 > > --- linux-2.6.15-mm4-sparc64/kernel/kprobes.c.old 2006-01-14 20:17:59.000000000 +0100 > +++ linux-2.6.15-mm4-sparc64/kernel/kprobes.c 2006-01-14 20:19:03.000000000 +0100 > @@ -344,23 +344,6 @@ > spin_unlock_irqrestore(&kretprobe_lock, flags); > } > > -/* > - * This kprobe pre_handler is registered with every kretprobe. When probe > - * hits it will set up the return probe. > - */ > -static int __kprobes pre_handler_kretprobe(struct kprobe *p, > - struct pt_regs *regs) > -{ > - struct kretprobe *rp = container_of(p, struct kretprobe, kp); > - unsigned long flags = 0; > - > - /*TODO: consider to only swap the RA after the last pre_handler fired */ > - spin_lock_irqsave(&kretprobe_lock, flags); > - arch_prepare_kretprobe(rp, regs); > - spin_unlock_irqrestore(&kretprobe_lock, flags); > - return 0; > -} > - > static inline void free_rp_inst(struct kretprobe *rp) > { > struct kretprobe_instance *ri; > @@ -578,6 +561,23 @@ > > #ifdef ARCH_SUPPORTS_KRETPROBES > > +/* > + * This kprobe pre_handler is registered with every kretprobe. When probe > + * hits it will set up the return probe. > + */ > +static int __kprobes pre_handler_kretprobe(struct kprobe *p, > + struct pt_regs *regs) > +{ > + struct kretprobe *rp = container_of(p, struct kretprobe, kp); > + unsigned long flags = 0; > + > + /*TODO: consider to only swap the RA after the last pre_handler fired */ > + spin_lock_irqsave(&kretprobe_lock, flags); > + arch_prepare_kretprobe(rp, regs); > + spin_unlock_irqrestore(&kretprobe_lock, flags); > + return 0; > +} > + > int __kprobes register_kretprobe(struct kretprobe *rp) > { > int ret = 0; >