diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-06-22 12:08:18 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-06-22 12:08:22 +0200 |
| commit | 4a9c75255e1fef4247cf960d3c3eb528c8cd8409 (patch) | |
| tree | fb7bfa432b059c299c06223e7dbf0643c4cca6d4 /arch/s390 | |
| parent | e6125fba81e362d9b314d10893af1d9dc5658f33 (diff) | |
| download | linux-4a9c75255e1fef4247cf960d3c3eb528c8cd8409.tar.gz linux-4a9c75255e1fef4247cf960d3c3eb528c8cd8409.tar.bz2 linux-4a9c75255e1fef4247cf960d3c3eb528c8cd8409.zip | |
[S390] pm: fix build error for !SMP
Fix build error for !SMP:
arch/s390/power/built-in.o: In function `swsusp_arch_resume':
(.text+0x1b4): undefined reference to `smp_get_phys_cpu_id'
arch/s390/power/built-in.o: In function `swsusp_arch_resume':
(.text+0x288): undefined reference to `smp_switch_boot_cpu_in_resume'
make: *** [.tmp_vmlinux1] Error 1
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/power/swsusp_asm64.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/s390/power/swsusp_asm64.S b/arch/s390/power/swsusp_asm64.S index 3c74e7d827c9..76d688da32fa 100644 --- a/arch/s390/power/swsusp_asm64.S +++ b/arch/s390/power/swsusp_asm64.S @@ -109,10 +109,11 @@ swsusp_arch_resume: aghi %r15,-STACK_FRAME_OVERHEAD stg %r1,__SF_BACKCHAIN(%r15) +#ifdef CONFIG_SMP /* Save boot cpu number */ brasl %r14,smp_get_phys_cpu_id lgr %r10,%r2 - +#endif /* Deactivate DAT */ stnsm __SF_EMPTY(%r15),0xfb @@ -177,11 +178,12 @@ swsusp_arch_resume: /* Pointer to save arae */ lghi %r13,0x1000 +#ifdef CONFIG_SMP /* Switch CPUs */ lgr %r2,%r10 /* get cpu id */ llgf %r3,0x318(%r13) brasl %r14,smp_switch_boot_cpu_in_resume - +#endif /* Restore prefix register */ spx 0x318(%r13) |