diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-09 00:05:18 (GMT) |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2010-06-09 00:05:18 (GMT) |
| commit | 44b56603c4c476b845a824cff6fe905c6268b2a1 (patch) | |
| tree | b7e792414fef2390718a657765719fbbb529ce84 /kernel/profile.c | |
| parent | c3935e30495869dd611e1cd62253c94ebc7c6c04 (diff) | |
| parent | b160fdabe93a8a53094f90f02bf4dcb500782aab (diff) | |
| download | linux-fsl-qoriq-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.xz | |
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
Diffstat (limited to 'kernel/profile.c')
| -rw-r--r-- | kernel/profile.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/profile.c b/kernel/profile.c index a55d3a3..dfadc5b 100644 --- a/kernel/profile.c +++ b/kernel/profile.c @@ -127,8 +127,10 @@ int __ref profile_init(void) return 0; prof_buffer = vmalloc(buffer_bytes); - if (prof_buffer) + if (prof_buffer) { + memset(prof_buffer, 0, buffer_bytes); return 0; + } free_cpumask_var(prof_cpu_mask); return -ENOMEM; |