diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2011-05-23 04:24:50 -0400 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-05-23 04:24:33 -0400 |
| commit | 5bd418784a2764a8d9de177a5462bfc008fd334a (patch) | |
| tree | 1097a2acba98000d9e6b40f2f197f3e69ebb3762 /arch | |
| parent | 5f420c5bd15c948302aafd3341903bc06895f1bb (diff) | |
[S390] cpu hotplug: fix external interrupt subclass mask handling
When disabling a cpu all external interrupt subclass masks in control
register 0 get cleared. However instead of the service signal subclass
mask bit an unused bit got cleared.
Accidently (or luckily) the service subclass mask gets cleared with the
pfault_fini() call that happens just before the rest of the subclass
mask bits get cleared.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/s390/kernel/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index fed71dcaa0d6..f8e85ecbc459 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c | |||
| @@ -654,8 +654,8 @@ int __cpu_disable(void) | |||
| 654 | 654 | ||
| 655 | /* disable all external interrupts */ | 655 | /* disable all external interrupts */ |
| 656 | cr_parms.orvals[0] = 0; | 656 | cr_parms.orvals[0] = 0; |
| 657 | cr_parms.andvals[0] = ~(1 << 15 | 1 << 14 | 1 << 13 | 1 << 12 | | 657 | cr_parms.andvals[0] = ~(1 << 15 | 1 << 14 | 1 << 13 | 1 << 11 | |
| 658 | 1 << 11 | 1 << 10 | 1 << 6 | 1 << 4); | 658 | 1 << 10 | 1 << 9 | 1 << 6 | 1 << 4); |
| 659 | /* disable all I/O interrupts */ | 659 | /* disable all I/O interrupts */ |
| 660 | cr_parms.orvals[6] = 0; | 660 | cr_parms.orvals[6] = 0; |
| 661 | cr_parms.andvals[6] = ~(1 << 31 | 1 << 30 | 1 << 29 | 1 << 28 | | 661 | cr_parms.andvals[6] = ~(1 << 31 | 1 << 30 | 1 << 29 | 1 << 28 | |