From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761641AbXGQMWS (ORCPT ); Tue, 17 Jul 2007 08:22:18 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761547AbXGQMUf (ORCPT ); Tue, 17 Jul 2007 08:20:35 -0400 Received: from mtagate4.de.ibm.com ([195.212.29.153]:21119 "EHLO mtagate4.de.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753673AbXGQMUc (ORCPT ); Tue, 17 Jul 2007 08:20:32 -0400 Message-Id: <20070717122306.183443247@de.ibm.com> References: <20070717121747.591687140@de.ibm.com> User-Agent: quilt/0.46-1 Date: Tue, 17 Jul 2007 14:17:53 +0200 From: Martin Schwidefsky To: linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org Cc: Heiko Carstens , Martin Schwidefsky Subject: [patch 6/8] Simplify stack trace. Content-Disposition: inline; filename=005-stack-trace.diff Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Heiko Carstens sparse gives us a few of these: stacktrace.c:69:38: warning: incorrect type in argument 2 (different signedness) stacktrace.c:69:38: expected unsigned int *skip Just get rid of the 'skip' argument since it is contained in the struct stack_trace that gets passed anyway. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky --- arch/s390/kernel/stacktrace.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) Index: quilt-2.6/arch/s390/kernel/stacktrace.c =================================================================== --- quilt-2.6.orig/arch/s390/kernel/stacktrace.c +++ quilt-2.6/arch/s390/kernel/stacktrace.c @@ -12,7 +12,6 @@ #include static unsigned long save_context_stack(struct stack_trace *trace, - unsigned int *skip, unsigned long sp, unsigned long low, unsigned long high) @@ -28,10 +27,10 @@ static unsigned long save_context_stack( sf = (struct stack_frame *)sp; while(1) { addr = sf->gprs[8] & PSW_ADDR_INSN; - if (!(*skip)) + if (!trace->skip) trace->entries[trace->nr_entries++] = addr; else - (*skip)--; + trace->skip--; if (trace->nr_entries >= trace->max_entries) return sp; low = sp; @@ -48,10 +47,10 @@ static unsigned long save_context_stack( return sp; regs = (struct pt_regs *)sp; addr = regs->psw.addr & PSW_ADDR_INSN; - if (!(*skip)) + if (!trace->skip) trace->entries[trace->nr_entries++] = addr; else - (*skip)--; + trace->skip--; if (trace->nr_entries >= trace->max_entries) return sp; low = sp; @@ -65,20 +64,17 @@ void save_stack_trace(struct stack_trace unsigned long orig_sp, new_sp; orig_sp = sp & PSW_ADDR_INSN; - - new_sp = save_context_stack(trace, &trace->skip, orig_sp, - S390_lowcore.panic_stack - PAGE_SIZE, - S390_lowcore.panic_stack); + new_sp = save_context_stack(trace, orig_sp, + S390_lowcore.panic_stack - PAGE_SIZE, + S390_lowcore.panic_stack); if (new_sp != orig_sp) return; - new_sp = save_context_stack(trace, &trace->skip, new_sp, - S390_lowcore.async_stack - ASYNC_SIZE, - S390_lowcore.async_stack); + new_sp = save_context_stack(trace, new_sp, + S390_lowcore.async_stack - ASYNC_SIZE, + S390_lowcore.async_stack); if (new_sp != orig_sp) return; - - save_context_stack(trace, &trace->skip, new_sp, + save_context_stack(trace, new_sp, S390_lowcore.thread_info, S390_lowcore.thread_info + THREAD_SIZE); - return; } -- blue skies, Martin. "Reality continues to ruin my life." - Calvin.