From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Message-ID: <528E3CBC.7090204@infradead.org> Date: Thu, 21 Nov 2013 09:02:52 -0800 From: Randy Dunlap MIME-Version: 1.0 References: <1385022715-21398-1-git-send-email-richard@nod.at> In-Reply-To: <1385022715-21398-1-git-send-email-richard@nod.at> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Subject: Re: [PATCH] um: Rename print_stack_trace to do_stack_trace To: Richard Weinberger Cc: user-mode-linux-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org List-ID: On 11/21/13 00:31, Richard Weinberger wrote: > We cannot use print_stack_trace because the name conflicts > with linux/stacktrace.h. > > Reported-by: Randy Dunlap > Signed-off-by: Richard Weinberger Acked-by: Randy Dunlap Thanks. > --- > arch/um/kernel/sysrq.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/um/kernel/sysrq.c b/arch/um/kernel/sysrq.c > index 4d6fdf6..799d7e4 100644 > --- a/arch/um/kernel/sysrq.c > +++ b/arch/um/kernel/sysrq.c > @@ -19,7 +19,7 @@ struct stack_frame { > unsigned long return_address; > }; > > -static void print_stack_trace(unsigned long *sp, unsigned long bp) > +static void do_stack_trace(unsigned long *sp, unsigned long bp) > { > int reliable; > unsigned long addr; > @@ -94,5 +94,5 @@ void show_stack(struct task_struct *task, unsigned long *stack) > } > printk(KERN_CONT "\n"); > > - print_stack_trace(sp, bp); > + do_stack_trace(sp, bp); > } > -- ~Randy