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: Nicolas Pitre <nico@linaro.org> Acked-by: Will Deacon <will.deacon@arm.com> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
@ -16,7 +16,7 @@
|
|||||||
extern const unsigned char relocate_new_kernel[];
|
extern const unsigned char relocate_new_kernel[];
|
||||||
extern const unsigned int relocate_new_kernel_size;
|
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_start_address;
|
||||||
extern unsigned long kexec_indirection_page;
|
extern unsigned long kexec_indirection_page;
|
||||||
@ -114,7 +114,7 @@ void machine_kexec(struct kimage *image)
|
|||||||
kexec_reinit();
|
kexec_reinit();
|
||||||
local_irq_disable();
|
local_irq_disable();
|
||||||
local_fiq_disable();
|
local_fiq_disable();
|
||||||
setup_mm_for_reboot(0); /* mode is not used, so just pass 0*/
|
setup_mm_for_reboot();
|
||||||
flush_cache_all();
|
flush_cache_all();
|
||||||
outer_flush_all();
|
outer_flush_all();
|
||||||
outer_disable();
|
outer_disable();
|
||||||
|
@ -57,7 +57,7 @@ static const char *isa_modes[] = {
|
|||||||
"ARM" , "Thumb" , "Jazelle", "ThumbEE"
|
"ARM" , "Thumb" , "Jazelle", "ThumbEE"
|
||||||
};
|
};
|
||||||
|
|
||||||
extern void setup_mm_for_reboot(char mode);
|
extern void setup_mm_for_reboot(void);
|
||||||
|
|
||||||
static volatile int hlt_counter;
|
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
|
* we may need it to insert some 1:1 mappings so that
|
||||||
* soft boot works.
|
* soft boot works.
|
||||||
*/
|
*/
|
||||||
setup_mm_for_reboot(mode);
|
setup_mm_for_reboot();
|
||||||
|
|
||||||
/* Clean and invalidate caches */
|
/* Clean and invalidate caches */
|
||||||
flush_cache_all();
|
flush_cache_all();
|
||||||
|
@ -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
|
* the user-mode pages. This will then ensure that we have predictable
|
||||||
* results when turning the mmu off
|
* 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
|
* We need to access to user-mode page tables here. For kernel threads
|
||||||
|
@ -43,7 +43,7 @@ void __init paging_init(struct machine_desc *mdesc)
|
|||||||
/*
|
/*
|
||||||
* We don't need to do anything here for nommu machines.
|
* We don't need to do anything here for nommu machines.
|
||||||
*/
|
*/
|
||||||
void setup_mm_for_reboot(char mode)
|
void setup_mm_for_reboot(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user