diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2020-07-10 11:59:59 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2020-07-10 11:59:59 +0200 |
| commit | e1bcad609f5a533da45fac071cf0849b86dbab92 (patch) | |
| tree | bc77cb21c81c053b99271c7bac9f6bc071cc56a6 /kernel/padata.c | |
| parent | lockdep: Split header file into lockdep and lockdep_types (diff) | |
| parent | x86/entry: Rename idtentry_enter/exit_cond_rcu() to idtentry_enter/exit() (diff) | |
| download | wireguard-linux-e1bcad609f5a533da45fac071cf0849b86dbab92.tar.xz wireguard-linux-e1bcad609f5a533da45fac071cf0849b86dbab92.zip | |
Merge branch 'tip/x86/entry'
Diffstat (limited to 'kernel/padata.c')
| -rw-r--r-- | kernel/padata.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/padata.c b/kernel/padata.c index 29fc5d87a4cd..4373f7adaa40 100644 --- a/kernel/padata.c +++ b/kernel/padata.c @@ -335,7 +335,7 @@ static void padata_reorder(struct parallel_data *pd) * * Ensure reorder queue is read after pd->lock is dropped so we see * new objects from another task in padata_do_serial. Pairs with - * smp_mb__after_atomic in padata_do_serial. + * smp_mb in padata_do_serial. */ smp_mb(); @@ -418,7 +418,7 @@ void padata_do_serial(struct padata_priv *padata) * with the trylock of pd->lock in padata_reorder. Pairs with smp_mb * in padata_reorder. */ - smp_mb__after_atomic(); + smp_mb(); padata_reorder(pd); } |