projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'driver-core-3.8-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
padata.c
diff --git
a/kernel/padata.c
b/kernel/padata.c
index 89fe3d1b9efbc1f34351e5752dd730db3c5bbab4..072f4ee4eb893a5341942146775c2ce9fcc1dbc8 100644
(file)
--- a/
kernel/padata.c
+++ b/
kernel/padata.c
@@
-171,7
+171,7
@@
static struct padata_priv *padata_get_next(struct parallel_data *pd)
{
int cpu, num_cpus;
unsigned int next_nr, next_index;
{
int cpu, num_cpus;
unsigned int next_nr, next_index;
- struct padata_parallel_queue *
queue, *
next_queue;
+ struct padata_parallel_queue *next_queue;
struct padata_priv *padata;
struct padata_list *reorder;
struct padata_priv *padata;
struct padata_list *reorder;
@@
-204,8
+204,7
@@
static struct padata_priv *padata_get_next(struct parallel_data *pd)
goto out;
}
goto out;
}
- queue = per_cpu_ptr(pd->pqueue, smp_processor_id());
- if (queue->cpu_index == next_queue->cpu_index) {
+ if (__this_cpu_read(pd->pqueue->cpu_index) == next_queue->cpu_index) {
padata = ERR_PTR(-ENODATA);
goto out;
}
padata = ERR_PTR(-ENODATA);
goto out;
}