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

Commit 5aafec15 authored by Russell King's avatar Russell King
Browse files

ARM: restart: remove argument to setup_mm_for_reboot() 



setup_mm_for_reboot() doesn't make use of its argument, so remove it.

Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ac15e00b

arch/arm/kernel/machine_kexec.c

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
extern const unsigned char relocate_new_kernel[];

extern const unsigned int relocate_new_kernel_size;



extern void setup_mm_for_reboot(char mode);

extern void setup_mm_for_reboot(void);



extern unsigned long kexec_start_address;

extern unsigned long kexec_indirection_page;
@@ -114,7 +114,7 @@ void machine_kexec(struct kimage *image) 
		kexec_reinit();

	local_irq_disable();

	local_fiq_disable();

	setup_mm_for_reboot(0); /* mode is not used, so just pass 0*/

	setup_mm_for_reboot();

	flush_cache_all();

	outer_flush_all();

	outer_disable();

arch/arm/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static const char *isa_modes[] = { 
  "ARM" , "Thumb" , "Jazelle", "ThumbEE"

};



extern void setup_mm_for_reboot(char mode);

extern void setup_mm_for_reboot(void);



static volatile int hlt_counter;
@@ -103,7 +103,7 @@ void arm_machine_restart(char mode, const char *cmd) 
	 * we may need it to insert some 1:1 mappings so that

	 * soft boot works.

	 */

	setup_mm_for_reboot(mode);

	setup_mm_for_reboot();



	/* Clean and invalidate caches */

	flush_cache_all();

arch/arm/mm/idmap.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ void identity_mapping_del(pgd_t *pgd, unsigned long addr, unsigned long end) 
 * 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)

{

	/*

	 * We need to access to user-mode page tables here. For kernel threads

arch/arm/mm/nommu.c

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void __init paging_init(struct machine_desc *mdesc) 
/*

 * We don't need to do anything here for nommu machines.

 */

void setup_mm_for_reboot(char mode)

void setup_mm_for_reboot(void)

{

}