Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753336AbdHJQlC (ORCPT ); Thu, 10 Aug 2017 12:41:02 -0400 Received: from terminus.zytor.com ([65.50.211.136]:40889 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753146AbdHJQlA (ORCPT ); Thu, 10 Aug 2017 12:41:00 -0400 Date: Thu, 10 Aug 2017 09:36:01 -0700 From: tip-bot for Masami Hiramatsu Message-ID: Cc: anil.s.keshavamurthy@intel.com, ananth@in.ibm.com, francis.deslauriers@efficios.com, davem@davemloft.net, jcmvbkbc@gmail.com, starvik@axis.com, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, jesper.nilsson@axis.com, ysato@users.sourceforge.jp, mhiramat@kernel.org, mingo@kernel.org, chris@zankel.net, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: chris@zankel.net, mhiramat@kernel.org, mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, ysato@users.sourceforge.jp, jesper.nilsson@axis.com, starvik@axis.com, jcmvbkbc@gmail.com, torvalds@linux-foundation.org, tglx@linutronix.de, peterz@infradead.org, francis.deslauriers@efficios.com, ananth@in.ibm.com, anil.s.keshavamurthy@intel.com, davem@davemloft.net In-Reply-To: <150172782555.27216.2805751327900543374.stgit@devbox> References: <150172782555.27216.2805751327900543374.stgit@devbox> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] cris: Mark _stext and _end as char-arrays, not single char variables Git-Commit-ID: c2579fee22483b0f156099abd9996d900634562c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3930 Lines: 104 Commit-ID: c2579fee22483b0f156099abd9996d900634562c Gitweb: http://git.kernel.org/tip/c2579fee22483b0f156099abd9996d900634562c Author: Masami Hiramatsu AuthorDate: Thu, 3 Aug 2017 11:37:15 +0900 Committer: Ingo Molnar CommitDate: Thu, 10 Aug 2017 16:28:53 +0200 cris: Mark _stext and _end as char-arrays, not single char variables Mark _stext and _end as character arrays instead of single character variable, like include/asm-generic/sections.h does. Signed-off-by: Masami Hiramatsu Cc: Ananth N Mavinakayanahalli Cc: Anil S Keshavamurthy Cc: Chris Zankel Cc: David S . Miller Cc: Francis Deslauriers Cc: Jesper Nilsson Cc: Linus Torvalds Cc: Max Filippov Cc: Mikael Starvik Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Yoshinori Sato Cc: linux-arch@vger.kernel.org Cc: linux-cris-kernel@axis.com Cc: mathieu.desnoyers@efficios.com Link: http://lkml.kernel.org/r/150172782555.27216.2805751327900543374.stgit@devbox Signed-off-by: Ingo Molnar --- arch/cris/arch-v32/mach-a3/arbiter.c | 4 ++-- arch/cris/arch-v32/mach-fs/arbiter.c | 4 ++-- arch/cris/kernel/traps.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/cris/arch-v32/mach-a3/arbiter.c b/arch/cris/arch-v32/mach-a3/arbiter.c index ab5c421..735a9b0 100644 --- a/arch/cris/arch-v32/mach-a3/arbiter.c +++ b/arch/cris/arch-v32/mach-a3/arbiter.c @@ -227,7 +227,7 @@ static void crisv32_arbiter_config(int arbiter, int region, int unused_slots) } } -extern char _stext, _etext; +extern char _stext[], _etext[]; static void crisv32_arbiter_init(void) { @@ -265,7 +265,7 @@ static void crisv32_arbiter_init(void) #ifndef CONFIG_ETRAX_KGDB /* Global watch for writes to kernel text segment. */ - crisv32_arbiter_watch(virt_to_phys(&_stext), &_etext - &_stext, + crisv32_arbiter_watch(virt_to_phys(_stext), _etext - _stext, MARB_CLIENTS(arbiter_all_clients, arbiter_bar_all_clients), arbiter_all_write, NULL); #endif diff --git a/arch/cris/arch-v32/mach-fs/arbiter.c b/arch/cris/arch-v32/mach-fs/arbiter.c index c97f4d8..047c70b 100644 --- a/arch/cris/arch-v32/mach-fs/arbiter.c +++ b/arch/cris/arch-v32/mach-fs/arbiter.c @@ -158,7 +158,7 @@ static void crisv32_arbiter_config(int region, int unused_slots) } } -extern char _stext, _etext; +extern char _stext[], _etext[]; static void crisv32_arbiter_init(void) { @@ -190,7 +190,7 @@ static void crisv32_arbiter_init(void) #ifndef CONFIG_ETRAX_KGDB /* Global watch for writes to kernel text segment. */ - crisv32_arbiter_watch(virt_to_phys(&_stext), &_etext - &_stext, + crisv32_arbiter_watch(virt_to_phys(_stext), _etext - _stext, arbiter_all_clients, arbiter_all_write, NULL); #endif } diff --git a/arch/cris/kernel/traps.c b/arch/cris/kernel/traps.c index a01636a..d98131c 100644 --- a/arch/cris/kernel/traps.c +++ b/arch/cris/kernel/traps.c @@ -42,7 +42,7 @@ void (*nmi_handler)(struct pt_regs *); void show_trace(unsigned long *stack) { unsigned long addr, module_start, module_end; - extern char _stext, _etext; + extern char _stext[], _etext[]; int i; pr_err("\nCall Trace: "); @@ -69,8 +69,8 @@ void show_trace(unsigned long *stack) * down the cause of the crash will be able to figure * out the call path that was taken. */ - if (((addr >= (unsigned long)&_stext) && - (addr <= (unsigned long)&_etext)) || + if (((addr >= (unsigned long)_stext) && + (addr <= (unsigned long)_etext)) || ((addr >= module_start) && (addr <= module_end))) { #ifdef CONFIG_KALLSYMS print_ip_sym(addr);