projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge commit '3cf2f34' into sched/core, to fix build error
[cascardo/linux.git]
/
drivers
/
net
/
ethernet
/
intel
/
i40e
/
i40e_main.c
diff --git
a/drivers/net/ethernet/intel/i40e/i40e_main.c
b/drivers/net/ethernet/intel/i40e/i40e_main.c
index
cf0761f
..
2e72449
100644
(file)
--- a/
drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/
drivers/net/ethernet/intel/i40e/i40e_main.c
@@
-4676,7
+4676,7
@@
static void i40e_service_event_complete(struct i40e_pf *pf)
BUG_ON(!test_bit(__I40E_SERVICE_SCHED, &pf->state));
/* flush memory to make sure state is correct before next watchog */
- smp_mb__before_
clear_bit
();
+ smp_mb__before_
atomic
();
clear_bit(__I40E_SERVICE_SCHED, &pf->state);
}