aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPekka Enberg <penberg@cs.helsinki.fi>2007-05-08 03:24:58 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:00 -0400
commit6d4f9c55002544bac1c99d0bab46c89319ab876e (patch)
treeaea768f9ea94966d7fca165368ee10adf194525f /kernel
parentfe08a9d4982d9618ec25760ea715c46fe051e508 (diff)
module: use krealloc
This converts an open-coded krealloc() to use the shiny new API. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Acked-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/module.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/module.c b/kernel/module.c
index 1eb8ca565ba0..9bdbd1217a6f 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -310,14 +310,14 @@ static int split_block(unsigned int i, unsigned short size)
310{ 310{
311 /* Reallocation required? */ 311 /* Reallocation required? */
312 if (pcpu_num_used + 1 > pcpu_num_allocated) { 312 if (pcpu_num_used + 1 > pcpu_num_allocated) {
313 int *new = kmalloc(sizeof(new[0]) * pcpu_num_allocated*2, 313 int *new;
314 GFP_KERNEL); 314
315 new = krealloc(pcpu_size, sizeof(new[0])*pcpu_num_allocated*2,
316 GFP_KERNEL);
315 if (!new) 317 if (!new)
316 return 0; 318 return 0;
317 319
318 memcpy(new, pcpu_size, sizeof(new[0])*pcpu_num_allocated);
319 pcpu_num_allocated *= 2; 320 pcpu_num_allocated *= 2;
320 kfree(pcpu_size);
321 pcpu_size = new; 321 pcpu_size = new;
322 } 322 }
323 323