From: Robin Holt <holt@sgi.com>
To: akpm@linux-foundation.org
Cc: Robin Holt <holt@sgi.com>, "H. Peter Anvin" <hpa@zytor.com>,
Russ Anderson <rja@sgi.com>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Guan Xuetao <gxt@mprc.pku.edu.cn>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
the arch/x86 maintainers <x86@kernel.org>,
Arm Mailing List <linux-arm-kernel@lists.infradead.org>
Subject: [PATCH -v11 resend 05/11] checkpatch.pl the new kernel/reboot.c file.
Date: Thu, 6 Jun 2013 06:47:18 -0500 [thread overview]
Message-ID: <1370519244-49918-6-git-send-email-holt@sgi.com> (raw)
In-Reply-To: <1370519244-49918-1-git-send-email-holt@sgi.com>
Get the new file to pass scripts/checkpatch.pl
Signed-off-by: Robin Holt <holt@sgi.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: the arch/x86 maintainers <x86@kernel.org>
Cc: Arm Mailing List <linux-arm-kernel@lists.infradead.org>
---
Changes since v6:
- Removed last remaining line length warning.
---
include/linux/reboot.h | 2 +-
kernel/reboot.c | 28 +++++++++++++---------------
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/include/linux/reboot.h b/include/linux/reboot.h
index 23b3630..c6eba21 100644
--- a/include/linux/reboot.h
+++ b/include/linux/reboot.h
@@ -26,7 +26,7 @@ extern void machine_shutdown(void);
struct pt_regs;
extern void machine_crash_shutdown(struct pt_regs *);
-/*
+/*
* Architecture independent implemenations of sys_reboot commands.
*/
diff --git a/kernel/reboot.c b/kernel/reboot.c
index 0616483..abb6a04 100644
--- a/kernel/reboot.c
+++ b/kernel/reboot.c
@@ -4,6 +4,8 @@
* Copyright (C) 2013 Linus Torvalds
*/
+#define pr_fmt(fmt) "reboot: " fmt
+
#include <linux/export.h>
#include <linux/kexec.h>
#include <linux/kmod.h>
@@ -114,9 +116,9 @@ void kernel_restart(char *cmd)
migrate_to_reboot_cpu();
syscore_shutdown();
if (!cmd)
- printk(KERN_EMERG "Restarting system.\n");
+ pr_emerg("Restarting system\n");
else
- printk(KERN_EMERG "Restarting system with command '%s'.\n", cmd);
+ pr_emerg("Restarting system with command '%s'\n", cmd);
kmsg_dump(KMSG_DUMP_RESTART);
machine_restart(cmd);
}
@@ -125,7 +127,7 @@ EXPORT_SYMBOL_GPL(kernel_restart);
static void kernel_shutdown_prepare(enum system_states state)
{
blocking_notifier_call_chain(&reboot_notifier_list,
- (state == SYSTEM_HALT)?SYS_HALT:SYS_POWER_OFF, NULL);
+ (state == SYSTEM_HALT) ? SYS_HALT : SYS_POWER_OFF, NULL);
system_state = state;
usermodehelper_disable();
device_shutdown();
@@ -140,11 +142,10 @@ void kernel_halt(void)
kernel_shutdown_prepare(SYSTEM_HALT);
migrate_to_reboot_cpu();
syscore_shutdown();
- printk(KERN_EMERG "System halted.\n");
+ pr_emerg("System halted\n");
kmsg_dump(KMSG_DUMP_HALT);
machine_halt();
}
-
EXPORT_SYMBOL_GPL(kernel_halt);
/**
@@ -159,7 +160,7 @@ void kernel_power_off(void)
pm_power_off_prepare();
migrate_to_reboot_cpu();
syscore_shutdown();
- printk(KERN_EMERG "Power down.\n");
+ pr_emerg("Power down\n");
kmsg_dump(KMSG_DUMP_POWEROFF);
machine_power_off();
}
@@ -188,10 +189,10 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
/* For safety, we require "magic" arguments. */
if (magic1 != LINUX_REBOOT_MAGIC1 ||
- (magic2 != LINUX_REBOOT_MAGIC2 &&
- magic2 != LINUX_REBOOT_MAGIC2A &&
+ (magic2 != LINUX_REBOOT_MAGIC2 &&
+ magic2 != LINUX_REBOOT_MAGIC2A &&
magic2 != LINUX_REBOOT_MAGIC2B &&
- magic2 != LINUX_REBOOT_MAGIC2C))
+ magic2 != LINUX_REBOOT_MAGIC2C))
return -EINVAL;
/*
@@ -234,7 +235,8 @@ SYSCALL_DEFINE4(reboot, int, magic1, int, magic2, unsigned int, cmd,
break;
case LINUX_REBOOT_CMD_RESTART2:
- if (strncpy_from_user(&buffer[0], arg, sizeof(buffer) - 1) < 0) {
+ ret = strncpy_from_user(&buffer[0], arg, sizeof(buffer) - 1);
+ if (ret < 0) {
ret = -EFAULT;
break;
}
@@ -282,7 +284,6 @@ void ctrl_alt_del(void)
else
kill_cad_pid(SIGINT, 1);
}
-
char poweroff_cmd[POWEROFF_CMD_PATH_LEN] = "/sbin/poweroff";
@@ -301,14 +302,11 @@ static int __orderly_poweroff(bool force)
ret = call_usermodehelper(argv[0], argv, envp, UMH_WAIT_EXEC);
argv_free(argv);
} else {
- printk(KERN_WARNING "%s failed to allocate memory for \"%s\"\n",
- __func__, poweroff_cmd);
ret = -ENOMEM;
}
if (ret && force) {
- printk(KERN_WARNING "Failed to start orderly shutdown: "
- "forcing the issue\n");
+ pr_warn("Failed to start orderly shutdown: forcing the issue\n");
/*
* I guess this should try to kick off some daemon to sync and
* poweroff asap. Or not even bother syncing if we're doing an
--
1.8.2.1
next prev parent reply other threads:[~2013-06-06 11:49 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-06 11:47 [PATCH -v11 resend 00/11] Shutdown from reboot_cpuid without stopping other cpus Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 01/11] CPU hotplug: Provide a generic helper to disable/enable CPU hotplug Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 02/11] Migrate shutdown/reboot to boot cpu Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 03/11] Remove -stable friendly PF_THREAD_BOUND define Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 04/11] Move shutdown/reboot related functions to kernel/reboot.c Robin Holt
2013-06-06 11:47 ` Robin Holt [this message]
2013-06-06 11:47 ` [PATCH -v11 resend 06/11] x86, prepare reboot_mode for moving to generic kernel code Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 07/11] unicore32, " Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 08/11] arm, Remove unused restart_mode fields from some arm subarchs Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 09/11] arm, prepare reboot_mode for moving to generic kernel code Robin Holt
2013-06-06 11:47 ` [PATCH -v11 resend 10/11] arm, change reboot_mode to use enum reboot_mode Robin Holt
2013-06-10 22:11 ` Andrew Morton
2013-06-19 10:58 ` Arnd Bergmann
2013-06-19 13:52 ` Arnd Bergmann
2013-06-19 17:21 ` Andrew Morton
2013-06-19 18:16 ` Arnd Bergmann
2013-06-25 21:41 ` Kevin Hilman
2013-06-27 21:28 ` Kevin Hilman
2013-06-27 21:39 ` Kevin Hilman
2013-06-06 11:47 ` [PATCH -v11 resend 11/11] Move arch/x86 reboot= handling to generic kernel Robin Holt
-- strict thread matches above, loose matches on Subject: below --
2013-05-16 16:14 [PATCH -v11 resend 00/11] Shutdown from reboot_cpuid without stopping other cpus Robin Holt
2013-05-16 16:14 ` [PATCH -v11 resend 05/11] checkpatch.pl the new kernel/reboot.c file Robin Holt
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=1370519244-49918-6-git-send-email-holt@sgi.com \
--to=holt@sgi.com \
--cc=akpm@linux-foundation.org \
--cc=gxt@mprc.pku.edu.cn \
--cc=hpa@zytor.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rja@sgi.com \
--cc=rmk+kernel@arm.linux.org.uk \
--cc=x86@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).