]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge commit '559fa6e76b27' into perf/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 23 May 2011 14:15:43 +0000 (16:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 May 2011 14:15:58 +0000 (16:15 +0200)
Merge reason: this commit was queued up quite some time ago but was
              forgotten about.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/profile.c

index 66f841b7fbd38fd0fcca92d62c4f70860b24bbb2..14c9f87b9fc95d8eeb545b7fe29cccc171c9df47 100644 (file)
@@ -126,11 +126,9 @@ int __ref profile_init(void)
        if (prof_buffer)
                return 0;
 
-       prof_buffer = vmalloc(buffer_bytes);
-       if (prof_buffer) {
-               memset(prof_buffer, 0, buffer_bytes);
+       prof_buffer = vzalloc(buffer_bytes);
+       if (prof_buffer)
                return 0;
-       }
 
        free_cpumask_var(prof_cpu_mask);
        return -ENOMEM;