2 files changed, 36 insertions, 12 deletions

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index 0518a2e948cf..4c86a8d84b4c 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -423,6 +423,25 @@ void task_end_request(ide_drive_t *drive, struct request *rq, u8 stat)
 }
 
 /*
+ * We got an interrupt on a task_in case, but no errors and no DRQ.
+ *
+ * It might be a spurious irq (shared irq), but it might be a
+ * command that had no output.
+ */
+static ide_startstop_t task_in_unexpected(ide_drive_t *drive, struct request *rq, u8 stat)
+{
+        /* Command all done? */
+        if (OK_STAT(stat, READY_STAT, BUSY_STAT)) {
+                task_end_request(drive, rq, stat);
+                return ide_stopped;
+        }
+
+        /* Assume it was a spurious irq */
+        ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
+        return ide_started;
+}
+
+/*
  * Handler for command with PIO data-in phase (Read/Read Multiple).
  */
 static ide_startstop_t task_in_intr(ide_drive_t *drive)
@@ -431,18 +450,17 @@ static ide_startstop_t task_in_intr(ide_drive_t *drive)
         struct request *rq = HWGROUP(drive)->rq;
         u8 stat = ide_read_status(drive);
 
-        /* new way for dealing with premature shared PCI interrupts */
-        if (!OK_STAT(stat, DRQ_STAT, BAD_R_STAT)) {
-                if (stat & (ERR_STAT | DRQ_STAT))
-                        return task_error(drive, rq, __FUNCTION__, stat);
-                /* No data yet, so wait for another IRQ. */
-                ide_set_handler(drive, &task_in_intr, WAIT_WORSTCASE, NULL);
-                return ide_started;
-        }
+        /* Error? */
+        if (stat & ERR_STAT)
+                return task_error(drive, rq, __FUNCTION__, stat);
+
+        /* Didn't want any data? Odd. */
+        if (!(stat & DRQ_STAT))
+                return task_in_unexpected(drive, rq, stat);
 
         ide_pio_datablock(drive, rq, 0);
 
-        /* If it was the last datablock check status and finish transfer. */
+        /* Are we done? Check status and finish transfer. */
         if (!hwif->nleft) {
                 stat = wait_drive_not_busy(drive);
                 if (!OK_STAT(stat, 0, BAD_STAT))
diff --git a/mm/slub.c b/mm/slub.c
index 96d63eb3ab17..ca71d5b81e4a 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1536,9 +1536,15 @@ new_slab:
          * That is only possible if certain conditions are met that are being
          * checked when a slab is created.
          */
-        if (!(gfpflags & __GFP_NORETRY) && (s->flags & __PAGE_ALLOC_FALLBACK))
-                return kmalloc_large(s->objsize, gfpflags);
-
+        if (!(gfpflags & __GFP_NORETRY) &&
+                                (s->flags & __PAGE_ALLOC_FALLBACK)) {
+                if (gfpflags & __GFP_WAIT)
+                        local_irq_enable();
+                object = kmalloc_large(s->objsize, gfpflags);
+                if (gfpflags & __GFP_WAIT)
+                        local_irq_disable();
+                return object;
+        }
         return NULL;
 debug:
         if (!alloc_debug_processing(s, c->page, object, addr))