From: Robin Holt <holt@sgi.com>
To: akpm@linux-foundation.org
Cc: Robin Holt <holt@sgi.com>,
Russell King <rmk+kernel@arm.linux.org.uk>,
Russ Anderson <rja@sgi.com>, "H. Peter Anvin" <hpa@zytor.com>,
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 09/11] arm, prepare reboot_mode for moving to generic kernel code.
Date: Thu, 6 Jun 2013 06:47:22 -0500 [thread overview]
Message-ID: <1370519244-49918-10-git-send-email-holt@sgi.com> (raw)
In-Reply-To: <1370519244-49918-1-git-send-email-holt@sgi.com>
This patch prepares for the moving the parsing of reboot= to the generic
kernel code by making reboot_mode into a more generic form.
Signed-off-by: Robin Holt <holt@sgi.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Cc: H. Peter Anvin <hpa@zytor.com>
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>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
Changes since -v10
- Uncommented an accidentally commented out line.
Changes since -v8
- Switched from using REBOOT_WARM/COLD to HARD/SOFT.
---
arch/arm/include/asm/mach/arch.h | 3 ++-
arch/arm/kernel/process.c | 8 ++++----
arch/arm/kernel/setup.c | 6 +++---
| 2 +-
4 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 308ad7d..e2b551e 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -9,6 +9,7 @@
*/
#ifndef __ASSEMBLY__
+#include <linux/reboot.h>
struct tag;
struct meminfo;
@@ -39,7 +40,7 @@ struct machine_desc {
unsigned char reserve_lp0 :1; /* never has lp0 */
unsigned char reserve_lp1 :1; /* never has lp1 */
unsigned char reserve_lp2 :1; /* never has lp2 */
- char restart_mode; /* default restart mode */
+ enum reboot_mode reboot_mode; /* default restart mode */
struct smp_operations *smp; /* SMP operations */
void (*fixup)(struct tag *, char **,
struct meminfo *);
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
index f219703..92b47df 100644
--- a/arch/arm/kernel/process.c
+++ b/arch/arm/kernel/process.c
@@ -174,14 +174,14 @@ void arch_cpu_idle(void)
default_idle();
}
-static char reboot_mode = 'h';
+enum reboot_mode reboot_mode = REBOOT_HARD;
-int __init reboot_setup(char *str)
+static int __init reboot_setup(char *str)
{
- reboot_mode = str[0];
+ if ('s' == str[0])
+ reboot_mode = REBOOT_SOFT;
return 1;
}
-
__setup("reboot=", reboot_setup);
void machine_shutdown(void)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index 1522c7a..e05df42 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -73,7 +73,7 @@ __setup("fpe=", fpe_setup);
extern void paging_init(struct machine_desc *desc);
extern void sanity_check_meminfo(void);
-extern void reboot_setup(char *str);
+extern enum reboot_mode reboot_mode;
extern void setup_dma_zone(struct machine_desc *desc);
unsigned int processor_id;
@@ -769,8 +769,8 @@ void __init setup_arch(char **cmdline_p)
setup_dma_zone(mdesc);
- if (mdesc->restart_mode)
- reboot_setup(&mdesc->restart_mode);
+ if (mdesc->reboot_mode != REBOOT_HARD)
+ reboot_mode = mdesc->reboot_mode;
init_mm.start_code = (unsigned long) _text;
init_mm.end_code = (unsigned long) _etext;
--git a/arch/arm/mach-footbridge/cats-hw.c b/arch/arm/mach-footbridge/cats-hw.c
index 6987a09..9669cc0 100644
--- a/arch/arm/mach-footbridge/cats-hw.c
+++ b/arch/arm/mach-footbridge/cats-hw.c
@@ -86,7 +86,7 @@ fixup_cats(struct tag *tags, char **cmdline, struct meminfo *mi)
MACHINE_START(CATS, "Chalice-CATS")
/* Maintainer: Philip Blundell */
.atag_offset = 0x100,
- .restart_mode = 's',
+ .reboot_mode = REBOOT_SOFT,
.fixup = fixup_cats,
.map_io = footbridge_map_io,
.init_irq = footbridge_init_irq,
--
1.8.2.1
next prev parent reply other threads:[~2013-06-06 11:47 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 ` [PATCH -v11 resend 05/11] checkpatch.pl the new kernel/reboot.c file Robin Holt
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 ` Robin Holt [this message]
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 09/11] arm, prepare reboot_mode for moving to generic kernel code 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-10-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).