diff options
Diffstat (limited to 'arch/ppc64/kernel/machine_kexec.c')
| -rw-r--r-- | arch/ppc64/kernel/machine_kexec.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/ppc64/kernel/machine_kexec.c b/arch/ppc64/kernel/machine_kexec.c index 06b25b59c8a8..fdb2fc649d72 100644 --- a/arch/ppc64/kernel/machine_kexec.c +++ b/arch/ppc64/kernel/machine_kexec.c | |||
| @@ -58,7 +58,7 @@ int machine_kexec_prepare(struct kimage *image) | |||
| 58 | * handle the virtual mode, we must make sure no destination | 58 | * handle the virtual mode, we must make sure no destination |
| 59 | * overlaps kernel static data or bss. | 59 | * overlaps kernel static data or bss. |
| 60 | */ | 60 | */ |
| 61 | for(i = 0; i < image->nr_segments; i++) | 61 | for (i = 0; i < image->nr_segments; i++) |
| 62 | if (image->segment[i].mem < __pa(_end)) | 62 | if (image->segment[i].mem < __pa(_end)) |
| 63 | return -ETXTBSY; | 63 | return -ETXTBSY; |
| 64 | 64 | ||
| @@ -76,7 +76,7 @@ int machine_kexec_prepare(struct kimage *image) | |||
| 76 | low = __pa(htab_address); | 76 | low = __pa(htab_address); |
| 77 | high = low + (htab_hash_mask + 1) * HASH_GROUP_SIZE; | 77 | high = low + (htab_hash_mask + 1) * HASH_GROUP_SIZE; |
| 78 | 78 | ||
| 79 | for(i = 0; i < image->nr_segments; i++) { | 79 | for (i = 0; i < image->nr_segments; i++) { |
| 80 | begin = image->segment[i].mem; | 80 | begin = image->segment[i].mem; |
| 81 | end = begin + image->segment[i].memsz; | 81 | end = begin + image->segment[i].memsz; |
| 82 | 82 | ||
| @@ -98,7 +98,7 @@ int machine_kexec_prepare(struct kimage *image) | |||
| 98 | low = *basep; | 98 | low = *basep; |
| 99 | high = low + (*sizep); | 99 | high = low + (*sizep); |
| 100 | 100 | ||
| 101 | for(i = 0; i < image->nr_segments; i++) { | 101 | for (i = 0; i < image->nr_segments; i++) { |
| 102 | begin = image->segment[i].mem; | 102 | begin = image->segment[i].mem; |
| 103 | end = begin + image->segment[i].memsz; | 103 | end = begin + image->segment[i].memsz; |
| 104 | 104 | ||
| @@ -274,7 +274,8 @@ union thread_union kexec_stack | |||
| 274 | 274 | ||
| 275 | /* Our assembly helper, in kexec_stub.S */ | 275 | /* Our assembly helper, in kexec_stub.S */ |
| 276 | extern NORET_TYPE void kexec_sequence(void *newstack, unsigned long start, | 276 | extern NORET_TYPE void kexec_sequence(void *newstack, unsigned long start, |
| 277 | void *image, void *control, void (*clear_all)(void)) ATTRIB_NORET; | 277 | void *image, void *control, |
| 278 | void (*clear_all)(void)) ATTRIB_NORET; | ||
| 278 | 279 | ||
| 279 | /* too late to fail here */ | 280 | /* too late to fail here */ |
| 280 | void machine_kexec(struct kimage *image) | 281 | void machine_kexec(struct kimage *image) |
