| From f1782b1d0fd0e4b7f40e23789548298a9ea3cb90 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Fri, 30 Dec 2016 00:07:38 +0300 |
| Subject: [PATCH 115/299] sh_eth: fix branch prediction in sh_eth_interrupt() |
| |
| IIUC, likely()/unlikely() should apply to the whole *if* statement's |
| expression, not a part of it -- fix such expression in sh_eth_interrupt() |
| accordingly... |
| |
| Fixes: 283e38db65e7 ("sh_eth: Fix serialisation of interrupt disable with interrupt & NAPI handlers") |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| (cherry picked from commit 2344ef3c86a7fe41f97bf66c7936001b6132860b) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/net/ethernet/renesas/sh_eth.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/renesas/sh_eth.c |
| +++ b/drivers/net/ethernet/renesas/sh_eth.c |
| @@ -1668,7 +1668,7 @@ static irqreturn_t sh_eth_interrupt(int |
| else |
| goto out; |
| |
| - if (!likely(mdp->irq_enabled)) { |
| + if (unlikely(!mdp->irq_enabled)) { |
| sh_eth_write(ndev, 0, EESIPR); |
| goto out; |
| } |
