Merge commit 'tip/core/iommu' into amd-iommu/fixes

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 8f05c38c2f06..65e12bca657c 100644
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -694,6 +694,9 @@ static ssize_t read_zero(struct file * file, char __user * buf,
                 written += chunk - unwritten;
                 if (unwritten)
                         break;
+                /* Consider changing this to just 'signal_pending()' with lots of testing */
+                if (fatal_signal_pending(current))
+                        return written ? written : -EINTR;
                 buf += chunk;
                 count -= chunk;
                 cond_resched();