public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Masami Hiramatsu <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
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
Subject: [tip:perf/core] cris: Mark _stext and _end as char-arrays, not single char variables
Date: Thu, 10 Aug 2017 09:36:01 -0700	[thread overview]
Message-ID: <tip-c2579fee22483b0f156099abd9996d900634562c@git.kernel.org> (raw)
In-Reply-To: <150172782555.27216.2805751327900543374.stgit@devbox>

Commit-ID:  c2579fee22483b0f156099abd9996d900634562c
Gitweb:     http://git.kernel.org/tip/c2579fee22483b0f156099abd9996d900634562c
Author:     Masami Hiramatsu <mhiramat@kernel.org>
AuthorDate: Thu, 3 Aug 2017 11:37:15 +0900
Committer:  Ingo Molnar <mingo@kernel.org>
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 <mhiramat@kernel.org>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: David S . Miller <davem@davemloft.net>
Cc: Francis Deslauriers <francis.deslauriers@efficios.com>
Cc: Jesper Nilsson <jesper.nilsson@axis.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
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 <mingo@kernel.org>
---
 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);

  reply	other threads:[~2017-08-10 16:41 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-03  2:33 [PATCH -tip v9 0/5] kprobes related bugfix Masami Hiramatsu
2017-08-03  2:35 ` [PATCH -tip v9 1/5] h8300: mark _stext and _etext as char-arrays, not single char Masami Hiramatsu
2017-08-10 16:35   ` [tip:perf/core] h8300: Mark _stext and _etext as char-arrays, not single char variables tip-bot for Masami Hiramatsu
2017-08-03  2:36 ` [PATCH -tip v9 2/5] xtensa: mark _stext and _end as char-arrays, not single char Masami Hiramatsu
2017-08-10 16:35   ` [tip:perf/core] xtensa: Mark _stext and _end as char-arrays, not single char variables tip-bot for Masami Hiramatsu
2017-08-03  2:37 ` [PATCH -tip v9 3/5] cris: mark _stext and _end as char-arrays, not single char Masami Hiramatsu
2017-08-10 16:36   ` tip-bot for Masami Hiramatsu [this message]
2017-08-16 11:01   ` Masami Hiramatsu
2017-08-18 18:38     ` Jesper Nilsson
2017-08-18 18:38   ` Jesper Nilsson
2017-08-03  2:38 ` [PATCH -tip v9 4/5] irq: Make irqentry text section unconditional Masami Hiramatsu
2017-08-10 16:36   ` [tip:perf/core] irq: Make the " tip-bot for Masami Hiramatsu
2017-08-03  2:39 ` [PATCH -tip v9 5/5] [BUGFIX] kprobes/x86: Do not jump-optimize kprobes on irq entry code Masami Hiramatsu
2017-08-10 16:36   ` [tip:perf/core] " tip-bot for Masami Hiramatsu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-c2579fee22483b0f156099abd9996d900634562c@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=ananth@in.ibm.com \
    --cc=anil.s.keshavamurthy@intel.com \
    --cc=chris@zankel.net \
    --cc=davem@davemloft.net \
    --cc=francis.deslauriers@efficios.com \
    --cc=hpa@zytor.com \
    --cc=jcmvbkbc@gmail.com \
    --cc=jesper.nilsson@axis.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mhiramat@kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=starvik@axis.com \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    --cc=ysato@users.sourceforge.jp \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox