linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GIT PULL] percpu changes for v3.8
@ 2012-12-11 14:24 Tejun Heo
  2012-12-11 15:30 ` Tejun Heo
  0 siblings, 1 reply; 2+ messages in thread
From: Tejun Heo @ 2012-12-11 14:24 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, Christoph Lameter

Hello, Linus.

Percpu changes for v3.8.  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.

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git for-next

Thanks.

----------------------------------------------------------------
Cyrill Gorcunov (1):
      mm, percpu: Make sure percpu_alloc early parameter has an argument

Joonsoo Kim (1):
      percpu: make pcpu_free_chunk() use pcpu_mem_free() instead of kfree()

 mm/percpu.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/mm/percpu.c b/mm/percpu.c
index ddc5efb..8c8e08f 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [GIT PULL] percpu changes for v3.8
  2012-12-11 14:24 [GIT PULL] percpu changes for v3.8 Tejun Heo
@ 2012-12-11 15:30 ` Tejun Heo
  0 siblings, 0 replies; 2+ messages in thread
From: Tejun Heo @ 2012-12-11 15:30 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: linux-kernel, Christoph Lameter

On Tue, Dec 11, 2012 at 06:24:53AM -0800, Tejun Heo wrote:
> Hello, Linus.
> 
> Percpu changes for v3.8.  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.
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git for-next

Oops, for-next and for-3.8 point to the same commit, so either should
work but this shoul have been,

  git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git for-3.8

Thanks.

-- 
tejun

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-12-11 15:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-11 14:24 [GIT PULL] percpu changes for v3.8 Tejun Heo
2012-12-11 15:30 ` Tejun Heo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).