summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-11-05 12:18:20 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-01-05 12:57:21 +0000
commite6849374f3fcec5a51ab6df40ae4d8034ba1c5e0 (patch)
tree18d60c971098d115b5969760489d915351a2b72c
parentd9eedaf329a28a20a4b0f18fed2beb40be10a406 (diff)
downloadop-kernel-dev-e6849374f3fcec5a51ab6df40ae4d8034ba1c5e0.zip
op-kernel-dev-e6849374f3fcec5a51ab6df40ae4d8034ba1c5e0.tar.gz
ARM: restart: lpc32xx & u300: remove unnecessary printk
Remove the: KERN_CRIT "RESET: Rebooting system\n" (lpc32xx) KERN_CRIT "RESET: shutting down/rebooting system\n" (u300) printk from the restart handler; we already print such a message from kernel_restart() in kernel/sys.c: KERN_EMERG "Restarting system.\n" so this is unnecessary. Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-lpc32xx/common.c2
-rw-r--r--arch/arm/mach-u300/core.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c
index b049fd1..369b152 100644
--- a/arch/arm/mach-lpc32xx/common.c
+++ b/arch/arm/mach-lpc32xx/common.c
@@ -317,8 +317,6 @@ void lpc23xx_restart(char mode, const char *cmd)
switch (mode) {
case 's':
case 'h':
- printk(KERN_CRIT "RESET: Rebooting system\n");
-
lpc32xx_watchdog_reset();
break;
diff --git a/arch/arm/mach-u300/core.c b/arch/arm/mach-u300/core.c
index 27be5a7..6979307 100644
--- a/arch/arm/mach-u300/core.c
+++ b/arch/arm/mach-u300/core.c
@@ -1897,7 +1897,6 @@ void u300_restart(char mode, const char *cmd)
switch (mode) {
case 's':
case 'h':
- printk(KERN_CRIT "RESET: shutting down/rebooting system\n");
#ifdef CONFIG_COH901327_WATCHDOG
coh901327_watchdog_reset();
#endif
OpenPOWER on IntegriCloud