diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-01 06:15:27 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-10 17:30:28 -0500 |
| commit | 5aafec15bdc54cf0722696c95091d7bd674bfcad (patch) | |
| tree | 7d34a0872eb05dfe0258d21a82cb6b07d870f962 | |
| parent | ac15e00b1efe705b66a36d1a6a9db7f6ed524c43 (diff) | |
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>
| -rw-r--r-- | arch/arm/kernel/machine_kexec.c | 4 | ||||
| -rw-r--r-- | arch/arm/kernel/process.c | 4 | ||||
| -rw-r--r-- | arch/arm/mm/idmap.c | 2 | ||||
| -rw-r--r-- | arch/arm/mm/nommu.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kernel/machine_kexec.c b/arch/arm/kernel/machine_kexec.c index c1b4463dcc83..cc40b965d42a 100644 --- a/arch/arm/kernel/machine_kexec.c +++ b/arch/arm/kernel/machine_kexec.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | extern const unsigned char relocate_new_kernel[]; | 16 | extern const unsigned char relocate_new_kernel[]; |
| 17 | extern const unsigned int relocate_new_kernel_size; | 17 | extern const unsigned int relocate_new_kernel_size; |
| 18 | 18 | ||
| 19 | extern void setup_mm_for_reboot(char mode); | 19 | extern void setup_mm_for_reboot(void); |
| 20 | 20 | ||
| 21 | extern unsigned long kexec_start_address; | 21 | extern unsigned long kexec_start_address; |
| 22 | extern unsigned long kexec_indirection_page; | 22 | extern unsigned long kexec_indirection_page; |
| @@ -114,7 +114,7 @@ void machine_kexec(struct kimage *image) | |||
| 114 | kexec_reinit(); | 114 | kexec_reinit(); |
| 115 | local_irq_disable(); | 115 | local_irq_disable(); |
| 116 | local_fiq_disable(); | 116 | local_fiq_disable(); |
| 117 | setup_mm_for_reboot(0); /* mode is not used, so just pass 0*/ | 117 | setup_mm_for_reboot(); |
| 118 | flush_cache_all(); | 118 | flush_cache_all(); |
| 119 | outer_flush_all(); | 119 | outer_flush_all(); |
| 120 | outer_disable(); | 120 | outer_disable(); |
diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 3bda1c379776..4181738452fc 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c | |||
| @@ -57,7 +57,7 @@ static const char *isa_modes[] = { | |||
| 57 | "ARM" , "Thumb" , "Jazelle", "ThumbEE" | 57 | "ARM" , "Thumb" , "Jazelle", "ThumbEE" |
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | extern void setup_mm_for_reboot(char mode); | 60 | extern void setup_mm_for_reboot(void); |
| 61 | 61 | ||
| 62 | static volatile int hlt_counter; | 62 | static volatile int hlt_counter; |
| 63 | 63 | ||
| @@ -103,7 +103,7 @@ void arm_machine_restart(char mode, const char *cmd) | |||
| 103 | * we may need it to insert some 1:1 mappings so that | 103 | * we may need it to insert some 1:1 mappings so that |
| 104 | * soft boot works. | 104 | * soft boot works. |
| 105 | */ | 105 | */ |
| 106 | setup_mm_for_reboot(mode); | 106 | setup_mm_for_reboot(); |
| 107 | 107 | ||
| 108 | /* Clean and invalidate caches */ | 108 | /* Clean and invalidate caches */ |
| 109 | flush_cache_all(); | 109 | flush_cache_all(); |
diff --git a/arch/arm/mm/idmap.c b/arch/arm/mm/idmap.c index 2be9139a4ef3..296ad2eaddb0 100644 --- a/arch/arm/mm/idmap.c +++ b/arch/arm/mm/idmap.c | |||
| @@ -78,7 +78,7 @@ void identity_mapping_del(pgd_t *pgd, unsigned long addr, unsigned long end) | |||
| 78 | * the user-mode pages. This will then ensure that we have predictable | 78 | * the user-mode pages. This will then ensure that we have predictable |
| 79 | * results when turning the mmu off | 79 | * results when turning the mmu off |
| 80 | */ | 80 | */ |
| 81 | void setup_mm_for_reboot(char mode) | 81 | void setup_mm_for_reboot(void) |
| 82 | { | 82 | { |
| 83 | /* | 83 | /* |
| 84 | * We need to access to user-mode page tables here. For kernel threads | 84 | * We need to access to user-mode page tables here. For kernel threads |
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 941a98c9e8aa..88417514b2c6 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c | |||
| @@ -43,7 +43,7 @@ void __init paging_init(struct machine_desc *mdesc) | |||
| 43 | /* | 43 | /* |
| 44 | * We don't need to do anything here for nommu machines. | 44 | * We don't need to do anything here for nommu machines. |
| 45 | */ | 45 | */ |
| 46 | void setup_mm_for_reboot(char mode) | 46 | void setup_mm_for_reboot(void) |
| 47 | { | 47 | { |
| 48 | } | 48 | } |
| 49 | 49 | ||
