Merge tag 'kvm-arm-for-v4.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master

KVM/ARM Fixes for v4.4-rc3.

Includes some timer fixes, properly unmapping PTEs, an errata fix, and two
tweaks to the EL2 panic code.

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index aa7b2083cb53..ee8d1ec61fab 100644
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -408,8 +408,6 @@ static int ravb_dmac_init(struct net_device *ndev)
         /* Interrupt enable: */
         /* Frame receive */
         ravb_write(ndev, RIC0_FRE0 | RIC0_FRE1, RIC0);
-        /* Receive FIFO full warning */
-        ravb_write(ndev, RIC1_RFWE, RIC1);
         /* Receive FIFO full error, descriptor empty */
         ravb_write(ndev, RIC2_QFE0 | RIC2_QFE1 | RIC2_RFFE, RIC2);
         /* Frame transmitted, timestamp FIFO updated */
@@ -733,8 +731,10 @@ static irqreturn_t ravb_interrupt(int irq, void *dev_id)
                             ((tis  & tic)  & BIT(q))) {
                                 if (napi_schedule_prep(&priv->napi[q])) {
                                         /* Mask RX and TX interrupts */
-                                        ravb_write(ndev, ric0 & ~BIT(q), RIC0);
-                                        ravb_write(ndev, tic  & ~BIT(q), TIC);
+                                        ric0 &= ~BIT(q);
+                                        tic &= ~BIT(q);
+                                        ravb_write(ndev, ric0, RIC0);
+                                        ravb_write(ndev, tic, TIC);
                                         __napi_schedule(&priv->napi[q]);
                                 } else {
                                         netdev_warn(ndev,