diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2011-11-14 11:19:01 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2011-11-14 11:19:08 +0100 |
| commit | fa2fb2f4a599c402bb2670dde27867dbbb7e3c45 (patch) | |
| tree | 12e69f3d36d229b5b10320943a4135977c075ebb /arch/s390/mm | |
| parent | 09b538833b85521d937a06faf61e6a3273253cc0 (diff) | |
| download | linux-3.10-fa2fb2f4a599c402bb2670dde27867dbbb7e3c45.tar.gz linux-3.10-fa2fb2f4a599c402bb2670dde27867dbbb7e3c45.tar.bz2 linux-3.10-fa2fb2f4a599c402bb2670dde27867dbbb7e3c45.zip | |
[S390] pfault: ignore leftover completion interrupts
Ignore completion interrupts if the initial interrupt hasn't been
received and the addressed task is not running. This case can only
happen if leftover (pending) completion interrupt gets delivered
which wasn't removed with the PFAULT CANCEL operation during cpu
hotplug.
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/mm')
| -rw-r--r-- | arch/s390/mm/fault.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 1766def5bc3..a9a301866b3 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -587,8 +587,13 @@ static void pfault_interrupt(unsigned int ext_int_code, } else { /* Completion interrupt was faster than initial * interrupt. Set pfault_wait to -1 so the initial - * interrupt doesn't put the task to sleep. */ - tsk->thread.pfault_wait = -1; + * interrupt doesn't put the task to sleep. + * If the task is not running, ignore the completion + * interrupt since it must be a leftover of a PFAULT + * CANCEL operation which didn't remove all pending + * completion interrupts. */ + if (tsk->state == TASK_RUNNING) + tsk->thread.pfault_wait = -1; } put_task_struct(tsk); } else { |