summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlaf Hering <olh@suse.de>2004-10-27 18:35:20 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2004-10-27 18:35:20 -0700
commit9ff7049f852ffd3d1aac9609e313d962205f55da (patch)
tree3e25a541ca8fe815db88ca353b4985e73b35ca64
parent105a45bf32f00c8e7e257d6d9ebc507d53547000 (diff)
[PATCH] remove double newline from sysrq action_msg
__handle_sysrq already prints a newline, so the action_msg string doesnt need yet another newline. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/i386/mach-voyager/voyager_basic.c2
-rw-r--r--arch/ppc/xmon/start.c2
-rw-r--r--arch/ppc64/xmon/start.c2
-rw-r--r--kernel/power/poweroff.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/i386/mach-voyager/voyager_basic.c b/arch/i386/mach-voyager/voyager_basic.c
index 61a481423cb9..ab33293aad5a 100644
--- a/arch/i386/mach-voyager/voyager_basic.c
+++ b/arch/i386/mach-voyager/voyager_basic.c
@@ -53,7 +53,7 @@ voyager_dump(int dummy1, struct pt_regs *dummy2, struct tty_struct *dummy3)
static struct sysrq_key_op sysrq_voyager_dump_op = {
.handler = voyager_dump,
.help_msg = "Voyager",
- .action_msg = "Dump Voyager Status\n",
+ .action_msg = "Dump Voyager Status",
};
#endif
diff --git a/arch/ppc/xmon/start.c b/arch/ppc/xmon/start.c
index bbe463913e74..8d3fde10bd70 100644
--- a/arch/ppc/xmon/start.c
+++ b/arch/ppc/xmon/start.c
@@ -102,7 +102,7 @@ static struct sysrq_key_op sysrq_xmon_op =
{
.handler = sysrq_handle_xmon,
.help_msg = "Xmon",
- .action_msg = "Entering xmon\n",
+ .action_msg = "Entering xmon",
};
#endif
diff --git a/arch/ppc64/xmon/start.c b/arch/ppc64/xmon/start.c
index 7db13af7b12d..e1fc2ca64543 100644
--- a/arch/ppc64/xmon/start.c
+++ b/arch/ppc64/xmon/start.c
@@ -35,7 +35,7 @@ static struct sysrq_key_op sysrq_xmon_op =
{
.handler = sysrq_handle_xmon,
.help_msg = "Xmon",
- .action_msg = "Entering xmon\n",
+ .action_msg = "Entering xmon",
};
static int __init setup_xmon_sysrq(void)
diff --git a/kernel/power/poweroff.c b/kernel/power/poweroff.c
index 875d8f11a8be..73cabf6f4781 100644
--- a/kernel/power/poweroff.c
+++ b/kernel/power/poweroff.c
@@ -32,7 +32,7 @@ static void handle_poweroff(int key, struct pt_regs *pt_regs,
static struct sysrq_key_op sysrq_poweroff_op = {
.handler = handle_poweroff,
.help_msg = "powerOff",
- .action_msg = "Power Off\n"
+ .action_msg = "Power Off"
};
static int pm_sysrq_init(void)