diff options
| author | Heiko Carstens | 2019-06-03 14:25:18 +0200 |
|---|---|---|
| committer | Heiko Carstens | 2019-06-07 10:09:37 +0200 |
| commit | 67626fadd26977aca76d3540b80ce99233399cdf (patch) | |
| tree | 5e19c3d97c5849ee38e5d5633515b26ade57e03e /arch/s390/kernel/swsusp.S | |
| parent | Merge tag 'vfio-ccw-20190603' of https://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | kernel-qcow2-linux-67626fadd26977aca76d3540b80ce99233399cdf.tar.gz kernel-qcow2-linux-67626fadd26977aca76d3540b80ce99233399cdf.tar.xz kernel-qcow2-linux-67626fadd26977aca76d3540b80ce99233399cdf.zip | |
s390: enforce CONFIG_SMP
There never have been distributions that shiped with CONFIG_SMP=n for
s390. In addition the kernel currently doesn't even compile with
CONFIG_SMP=n for s390. Most likely it wouldn't even work, even if we
fix the compile error, since nobody tests it, since there is no use
case that I can think of.
Therefore simply enforce CONFIG_SMP and get rid of some more or
less unused code.
Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/swsusp.S')
| -rw-r--r-- | arch/s390/kernel/swsusp.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kernel/swsusp.S b/arch/s390/kernel/swsusp.S index 19a3c427801a..a7baf0b5f818 100644 --- a/arch/s390/kernel/swsusp.S +++ b/arch/s390/kernel/swsusp.S @@ -162,7 +162,6 @@ ENTRY(swsusp_arch_resume) larl %r1,__swsusp_reset_dma lg %r1,0(%r1) BASR_EX %r14,%r1 -#ifdef CONFIG_SMP larl %r1,smp_cpu_mt_shift icm %r1,15,0(%r1) jz smt_done @@ -172,7 +171,6 @@ smt_loop: brc 8,smt_done /* accepted */ brc 2,smt_loop /* busy, try again */ smt_done: -#endif larl %r1,.Lnew_pgm_check_psw lpswe 0(%r1) pgm_check_entry: |