diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-06-22 06:08:18 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-06-22 06:08:22 -0400 |
commit | 4a9c75255e1fef4247cf960d3c3eb528c8cd8409 (patch) | |
tree | fb7bfa432b059c299c06223e7dbf0643c4cca6d4 /arch | |
parent | e6125fba81e362d9b314d10893af1d9dc5658f33 (diff) |
[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')
-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: | |||
109 | aghi %r15,-STACK_FRAME_OVERHEAD | 109 | aghi %r15,-STACK_FRAME_OVERHEAD |
110 | stg %r1,__SF_BACKCHAIN(%r15) | 110 | stg %r1,__SF_BACKCHAIN(%r15) |
111 | 111 | ||
112 | #ifdef CONFIG_SMP | ||
112 | /* Save boot cpu number */ | 113 | /* Save boot cpu number */ |
113 | brasl %r14,smp_get_phys_cpu_id | 114 | brasl %r14,smp_get_phys_cpu_id |
114 | lgr %r10,%r2 | 115 | lgr %r10,%r2 |
115 | 116 | #endif | |
116 | /* Deactivate DAT */ | 117 | /* Deactivate DAT */ |
117 | stnsm __SF_EMPTY(%r15),0xfb | 118 | stnsm __SF_EMPTY(%r15),0xfb |
118 | 119 | ||
@@ -177,11 +178,12 @@ swsusp_arch_resume: | |||
177 | /* Pointer to save arae */ | 178 | /* Pointer to save arae */ |
178 | lghi %r13,0x1000 | 179 | lghi %r13,0x1000 |
179 | 180 | ||
181 | #ifdef CONFIG_SMP | ||
180 | /* Switch CPUs */ | 182 | /* Switch CPUs */ |
181 | lgr %r2,%r10 /* get cpu id */ | 183 | lgr %r2,%r10 /* get cpu id */ |
182 | llgf %r3,0x318(%r13) | 184 | llgf %r3,0x318(%r13) |
183 | brasl %r14,smp_switch_boot_cpu_in_resume | 185 | brasl %r14,smp_switch_boot_cpu_in_resume |
184 | 186 | #endif | |
185 | /* Restore prefix register */ | 187 | /* Restore prefix register */ |
186 | spx 0x318(%r13) | 188 | spx 0x318(%r13) |
187 | 189 | ||