diff options
Diffstat (limited to 'arch/s390')
-rw-r--r-- | arch/s390/kernel/machine_kexec.c | 4 | ||||
-rw-r--r-- | arch/s390/kernel/vtime.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c index bad81b5832db..fbde6a915264 100644 --- a/arch/s390/kernel/machine_kexec.c +++ b/arch/s390/kernel/machine_kexec.c | |||
@@ -27,8 +27,8 @@ static void kexec_halt_all_cpus(void *); | |||
27 | 27 | ||
28 | typedef void (*relocate_kernel_t) (kimage_entry_t *, unsigned long); | 28 | typedef void (*relocate_kernel_t) (kimage_entry_t *, unsigned long); |
29 | 29 | ||
30 | const extern unsigned char relocate_kernel[]; | 30 | extern const unsigned char relocate_kernel[]; |
31 | const extern unsigned long long relocate_kernel_len; | 31 | extern const unsigned long long relocate_kernel_len; |
32 | 32 | ||
33 | int | 33 | int |
34 | machine_kexec_prepare(struct kimage *image) | 34 | machine_kexec_prepare(struct kimage *image) |
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c index dfe6f0856617..1f0439dc245a 100644 --- a/arch/s390/kernel/vtime.c +++ b/arch/s390/kernel/vtime.c | |||
@@ -356,7 +356,7 @@ static void internal_add_vtimer(struct vtimer_list *timer) | |||
356 | 356 | ||
357 | set_vtimer(event->expires); | 357 | set_vtimer(event->expires); |
358 | spin_unlock_irqrestore(&vt_list->lock, flags); | 358 | spin_unlock_irqrestore(&vt_list->lock, flags); |
359 | /* release CPU aquired in prepare_vtimer or mod_virt_timer() */ | 359 | /* release CPU acquired in prepare_vtimer or mod_virt_timer() */ |
360 | put_cpu(); | 360 | put_cpu(); |
361 | } | 361 | } |
362 | 362 | ||