Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755806Ab3EJOir (ORCPT ); Fri, 10 May 2013 10:38:47 -0400 Received: from mprc.pku.edu.cn ([162.105.203.9]:36336 "EHLO mprc.pku.edu.cn" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755021Ab3EJOio (ORCPT ); Fri, 10 May 2013 10:38:44 -0400 Message-ID: <53078.128.237.228.195.1368198321.squirrel@mprc.pku.edu.cn> In-Reply-To: <1368127405-112717-8-git-send-email-holt@sgi.com> References: <1368127405-112717-1-git-send-email-holt@sgi.com> <1368127405-112717-8-git-send-email-holt@sgi.com> Date: Fri, 10 May 2013 23:05:21 +0800 (CST) Subject: Re: [PATCH -v9 07/11] unicore32, prepare reboot_mode for moving to generic kernel code. From: "Xuetao Guan" To: "Robin Holt" Cc: "Andrew Morton" , "Robin Holt" , "Guan Xuetao" , "Russ Anderson" , "Russell King" , "H. Peter Anvin" , "Linux Kernel Mailing List" , "the arch/x86 maintainers" , "Arm Mailing List" Reply-To: gxt@mprc.pku.edu.cn User-Agent: SquirrelMail/1.4.8-4.0.1.el5 MIME-Version: 1.0 Content-Type: text/plain;charset=gb2312 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3747 Lines: 121 > 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 > To: Andrew Morton > Cc: Guan Xuetao > Cc: Russ Anderson > Cc: Robin Holt > Cc: Russell King > Cc: H. Peter Anvin > Cc: Linux Kernel Mailing List > Cc: the arch/x86 maintainers > Cc: Arm Mailing List Thanks for your hard work. For UniCore32 bits: (Though I can't compile and test it in recent months) Acked-by: Guan Xuetao > > --- > > Changes since -v8 > - Switched from using REBOOT_WARM/COLD to HARD/SOFT. > --- > arch/unicore32/kernel/process.c | 10 +++++----- > arch/unicore32/kernel/setup.h | 2 +- > arch/unicore32/mm/mmu.c | 2 +- > include/linux/reboot.h | 2 ++ > 4 files changed, 9 insertions(+), 7 deletions(-) > > diff --git a/arch/unicore32/kernel/process.c > b/arch/unicore32/kernel/process.c > index c944769..93dd035 100644 > --- a/arch/unicore32/kernel/process.c > +++ b/arch/unicore32/kernel/process.c > @@ -51,14 +51,14 @@ void arch_cpu_idle(void) > local_irq_enable(); > } > > -static char reboot_mode = 'h'; > +static enum reboot_mode reboot_mode = REBOOT_HARD; > > 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_halt(void) > @@ -88,7 +88,7 @@ void machine_restart(char *cmd) > * we may need it to insert some 1:1 mappings so that > * soft boot works. > */ > - setup_mm_for_reboot(reboot_mode); > + setup_mm_for_reboot(); > > /* Clean and invalidate caches */ > flush_cache_all(); > @@ -102,7 +102,7 @@ void machine_restart(char *cmd) > /* > * Now handle reboot code. > */ > - if (reboot_mode == 's') { > + if (reboot_mode == REBOOT_SOFT) { > /* Jump into ROM at address 0xffff0000 */ > cpu_reset(VECTORS_BASE); > } else { > diff --git a/arch/unicore32/kernel/setup.h b/arch/unicore32/kernel/setup.h > index 30f749d..f5c51b8 100644 > --- a/arch/unicore32/kernel/setup.h > +++ b/arch/unicore32/kernel/setup.h > @@ -22,7 +22,7 @@ extern void puv3_ps2_init(void); > extern void pci_puv3_preinit(void); > extern void __init puv3_init_gpio(void); > > -extern void setup_mm_for_reboot(char mode); > +extern void setup_mm_for_reboot(void); > > extern char __stubs_start[], __stubs_end[]; > extern char __vectors_start[], __vectors_end[]; > diff --git a/arch/unicore32/mm/mmu.c b/arch/unicore32/mm/mmu.c > index 43c20b4..4f5a532 100644 > --- a/arch/unicore32/mm/mmu.c > +++ b/arch/unicore32/mm/mmu.c > @@ -445,7 +445,7 @@ void __init paging_init(void) > * the user-mode pages. This will then ensure that we have predictable > * results when turning the mmu off > */ > -void setup_mm_for_reboot(char mode) > +void setup_mm_for_reboot(void) > { > unsigned long base_pmdval; > pgd_t *pgd; > diff --git a/include/linux/reboot.h b/include/linux/reboot.h > index 37d56c3..ca29a6f 100644 > --- a/include/linux/reboot.h > +++ b/include/linux/reboot.h > @@ -13,6 +13,8 @@ > enum reboot_mode { > REBOOT_COLD = 0, > REBOOT_WARM, > + REBOOT_HARD, > + REBOOT_SOFT, > }; > > extern int register_reboot_notifier(struct notifier_block *); > -- > 1.8.2.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/