lkml.org 
[lkml]   [2012]   [Dec]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[GIT PULL] percpu changes for v3.8
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

\
 
 \ /
  Last update: 2012-12-11 16:01    [W:0.036 / U:0.052 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site