Commit fef3ff2e authored Dec 12, 2012 by Linus Torvalds

percpu

Pull percpu changes from Tejun Heo:
 "Nothing exciting here either.  Joonsoo's is almost cosmetic.  Cyrill's
  patch fixes "percpu_alloc" early kernel param handling so that the
  kernel doesn't crash when the parameter is specified w/o any argument."

* 'for-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  mm, percpu: Make sure percpu_alloc early parameter has an argument
  percpu: make pcpu_free_chunk() use pcpu_mem_free() instead of kfree()

parents e7b55b8f 5479c78a

mm/percpu.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -631,7 +631,7 @@ static void pcpu_free_chunk(struct pcpu_chunk *chunk)
		if (!chunk)
		return;
		pcpu_mem_free(chunk->map, chunk->map_alloc * sizeof(chunk->map[0]));
		kfree(chunk);
		pcpu_mem_free(chunk, pcpu_chunk_struct_size);
		}

		/*
		@@ -1380,6 +1380,9 @@ enum pcpu_fc pcpu_chosen_fc __initdata = PCPU_FC_AUTO;

		static int __init percpu_alloc_setup(char *str)
		{
		if (!str)
		return -EINVAL;

		if (0)
		/* nada */;
		#ifdef CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK