diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-12-01 08:39:08 +0100 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-12-01 08:39:08 +0100 |
commit | fa3c9f3de2504bb09f8ad512f89837751a3eb741 (patch) | |
tree | 656df0e4ea62d1c5a45bb7bfd1b4714f4936d63b /drivers/s390 | |
parent | sh: boards: mach-se: use IS_ERR() instead of NULL check (diff) | |
parent | sh: Assume new page cache pages have dirty dcache lines. (diff) | |
download | linux-fa3c9f3de2504bb09f8ad512f89837751a3eb741.tar.xz linux-fa3c9f3de2504bb09f8ad512f89837751a3eb741.zip |
Merge branch 'sh/cachetlb' into sh-fixes-for-linus
Diffstat (limited to 'drivers/s390')
-rw-r--r-- | drivers/s390/cio/qdio_thinint.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c index 752dbee06af5..5d9c66627b6e 100644 --- a/drivers/s390/cio/qdio_thinint.c +++ b/drivers/s390/cio/qdio_thinint.c @@ -292,8 +292,8 @@ void qdio_shutdown_thinint(struct qdio_irq *irq_ptr) return; /* reset adapter interrupt indicators */ - put_indicator(irq_ptr->dsci); set_subchannel_ind(irq_ptr, 1); + put_indicator(irq_ptr->dsci); } void __exit tiqdio_unregister_thinints(void) |