projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'backport/v3.14.24-ltsi-rc1/codecs-20141124' into backport/v3.14.24-ltsi...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
mm
/
percpu-km.c
diff --git
a/mm/percpu-km.c
b/mm/percpu-km.c
index
df68085
..
89633fe
100644
(file)
--- a/
mm/percpu-km.c
+++ b/
mm/percpu-km.c
@@
-27,7
+27,7
@@
* chunk size is not aligned. percpu-km code will whine about it.
*/
* chunk size is not aligned. percpu-km code will whine about it.
*/
-#if
def CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK
+#if
defined(CONFIG_SMP) && defined(CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK)
#error "contiguous percpu allocation is incompatible with paged first chunk"
#endif
#error "contiguous percpu allocation is incompatible with paged first chunk"
#endif
@@
-35,7
+35,11
@@
static int pcpu_populate_chunk(struct pcpu_chunk *chunk, int off, int size)
{
static int pcpu_populate_chunk(struct pcpu_chunk *chunk, int off, int size)
{
- /* noop */
+ unsigned int cpu;
+
+ for_each_possible_cpu(cpu)
+ memset((void *)pcpu_chunk_addr(chunk, cpu, 0) + off, 0, size);
+
return 0;
}
return 0;
}