diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-01-09 06:14:54 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-01-09 06:15:06 -0500 |
commit | 81ffa0415b7ac9215c2030e2b15b8efff46605a0 (patch) | |
tree | abcda8b730dca3c3d19aa36c5eb5ea8433c89f2b /arch | |
parent | f47d52afd3bc310a010a037f3cd69d75d163e845 (diff) |
[S390] vdso: compile fix
!CONFIG_SMP:
arch/s390/kernel/vdso.c: In function 'vdso_init':
arch/s390/kernel/vdso.c:325: error: incompatible type for argument 2 of 'vdso_alloc_per_cpu'
Also move the code out of the BUG_ON statement since it won't be
executed on !CONFIG_BUG. And that would be a bug.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/s390/kernel/smp.c | 3 | ||||
-rw-r--r-- | arch/s390/kernel/vdso.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 9c0ccb532a45..2d337cbb9329 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
@@ -685,7 +685,8 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
685 | if (MACHINE_HAS_IEEE) | 685 | if (MACHINE_HAS_IEEE) |
686 | lowcore->extended_save_area_addr = (u32) save_area; | 686 | lowcore->extended_save_area_addr = (u32) save_area; |
687 | #else | 687 | #else |
688 | BUG_ON(vdso_alloc_per_cpu(smp_processor_id(), lowcore)); | 688 | if (vdso_alloc_per_cpu(smp_processor_id(), lowcore)) |
689 | BUG(); | ||
689 | #endif | 690 | #endif |
690 | set_prefix((u32)(unsigned long) lowcore); | 691 | set_prefix((u32)(unsigned long) lowcore); |
691 | local_mcck_enable(); | 692 | local_mcck_enable(); |
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c index 25a6a82f1c02..690e17819686 100644 --- a/arch/s390/kernel/vdso.c +++ b/arch/s390/kernel/vdso.c | |||
@@ -322,7 +322,8 @@ static int __init vdso_init(void) | |||
322 | vdso64_pagelist[vdso64_pages - 1] = virt_to_page(vdso_data); | 322 | vdso64_pagelist[vdso64_pages - 1] = virt_to_page(vdso_data); |
323 | vdso64_pagelist[vdso64_pages] = NULL; | 323 | vdso64_pagelist[vdso64_pages] = NULL; |
324 | #ifndef CONFIG_SMP | 324 | #ifndef CONFIG_SMP |
325 | BUG_ON(vdso_alloc_per_cpu(0, S390_lowcore)); | 325 | if (vdso_alloc_per_cpu(0, &S390_lowcore)) |
326 | BUG(); | ||
326 | #endif | 327 | #endif |
327 | vdso_init_cr5(); | 328 | vdso_init_cr5(); |
328 | #endif /* CONFIG_64BIT */ | 329 | #endif /* CONFIG_64BIT */ |