Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf tools: Fix sample type size calculation in 32 bits archs
  profile: Use vzalloc() rather than vmalloc() & memset()

1 files changed, 2 insertions, 4 deletions

diff --git a/kernel/profile.c b/kernel/profile.c
index 66f841b7fbd3..14c9f87b9fc9 100644
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -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;