X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=mm%2Fpercpu-km.c;h=89633fefc6a2b39d8d32d0204846f4ab8b303930;hb=4f6876031ee105466f400661a0dd3fa66c4f0c09;hp=df680855540a61264d27fbb041d274c5b6ca3d2a;hpb=7eb1053fd00a8f0e2263697638e17da8a251aa74;p=mirror_ubuntu-zesty-kernel.git

diff --git a/mm/percpu-km.c b/mm/percpu-km.c
index df680855540a..89633fefc6a2 100644
--- 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.
  */
 
-#ifdef 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
 
@@ -35,7 +35,11 @@
 
 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;
 }