Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c97a7008 authored by Robin Holt's avatar Robin Holt Committed by Linus Torvalds
Browse files

reboot: unicore32: prepare reboot_mode for moving to generic kernel code 



Prepare for the moving the parsing of reboot= to the generic kernel code
by making reboot_mode into a more generic form.

Signed-off-by: default avatarRobin Holt <holt@sgi.com>
Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
Cc: Russ Anderson <rja@sgi.com>
Cc: Robin Holt <holt@sgi.com>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Cc: H. Peter Anvin <hpa@zytor.com>
Acked-by: default avatarGuan Xuetao <gxt@mprc.pku.edu.cn>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent edf2b139

arch/unicore32/kernel/process.c

+5 −5
Original line number Diff line number Diff line
@@ -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 {

arch/unicore32/kernel/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -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[];

arch/unicore32/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/linux/reboot.h

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 
enum reboot_mode {

	REBOOT_COLD = 0,

	REBOOT_WARM,

	REBOOT_HARD,

	REBOOT_SOFT,

};



extern int register_reboot_notifier(struct notifier_block *);