diff options
| author | Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> | 2016-12-30 00:07:38 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-12-29 22:16:06 -0500 |
| commit | 2344ef3c86a7fe41f97bf66c7936001b6132860b (patch) | |
| tree | b82e67cabc0c530a6f8decfafc5747fa51eee275 | |
| parent | e400b7977e7c014bc0c298b2d834311770a777ac (diff) | |
| download | printk-2344ef3c86a7fe41f97bf66c7936001b6132860b.tar.gz | |
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>
| -rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index f341c1bc700167..0af7fc279c8560 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -1656,7 +1656,7 @@ static irqreturn_t sh_eth_interrupt(int irq, void *netdev) else goto out; - if (!likely(mdp->irq_enabled)) { + if (unlikely(!mdp->irq_enabled)) { sh_eth_write(ndev, 0, EESIPR); goto out; } |