Merge commit 'v2.6.31-rc7' into x86/cleanups

Merge reason: we were on -rc1 before - go up to -rc7

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 14 insertions, 11 deletions

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 1094d292630f..3b4e0766c7b2 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -3514,11 +3514,13 @@ static irqreturn_t nv_nic_irq(int foo, void *data)
         nv_msi_workaround(np);
 
 #ifdef CONFIG_FORCEDETH_NAPI
-        napi_schedule(&np->napi);
-
-        /* Disable furthur irq's
-           (msix not enabled with napi) */
-        writel(0, base + NvRegIrqMask);
+        if (napi_schedule_prep(&np->napi)) {
+                /*
+                 * Disable further irq's (msix not enabled with napi)
+                 */
+                writel(0, base + NvRegIrqMask);
+                __napi_schedule(&np->napi);
+        }
 
 #else
         do
@@ -3615,12 +3617,13 @@ static irqreturn_t nv_nic_irq_optimized(int foo, void *data)
         nv_msi_workaround(np);
 
 #ifdef CONFIG_FORCEDETH_NAPI
-        napi_schedule(&np->napi);
-
-        /* Disable furthur irq's
-           (msix not enabled with napi) */
-        writel(0, base + NvRegIrqMask);
-
+        if (napi_schedule_prep(&np->napi)) {
+                /*
+                 * Disable further irq's (msix not enabled with napi)
+                 */
+                writel(0, base + NvRegIrqMask);
+                __napi_schedule(&np->napi);
+        }
 #else
         do
         {