From aa795a461062abd5fe16592d42d375ea9f2309ea Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Sat, 30 Oct 2010 21:35:58 +0200 Subject: [PATCH] --- yaml --- r: 227829 b: refs/heads/master c: e21763dbce76d3a07ead438f8811b3e4bce0825b h: refs/heads/master i: 227827: e80be98f012c40861764ec09141d54eecdc8ec88 v: v3 --- [refs] | 2 +- trunk/arch/ia64/kernel/perfmon.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d16aafdf569f..e654a31e6b10 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75c1c91cb92806f960fcd6e53d2a0c21f343081c +refs/heads/master: e21763dbce76d3a07ead438f8811b3e4bce0825b diff --git a/trunk/arch/ia64/kernel/perfmon.c b/trunk/arch/ia64/kernel/perfmon.c index 39e534f5a3b0..3aee09d2c2de 100644 --- a/trunk/arch/ia64/kernel/perfmon.c +++ b/trunk/arch/ia64/kernel/perfmon.c @@ -829,10 +829,9 @@ pfm_rvmalloc(unsigned long size) unsigned long addr; size = PAGE_ALIGN(size); - mem = vmalloc(size); + mem = vzalloc(size); if (mem) { //printk("perfmon: CPU%d pfm_rvmalloc(%ld)=%p\n", smp_processor_id(), size, mem); - memset(mem, 0, size); addr = (unsigned long)mem; while (size > 0) { pfm_reserve_page(addr);