Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 227829
b: refs/heads/master
c: e21763d
h: refs/heads/master
i:
  227827: e80be98
v: v3
  • Loading branch information
Jesper Juhl authored and Tony Luck committed Dec 28, 2010
1 parent 8242314 commit aa795a4
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 75c1c91cb92806f960fcd6e53d2a0c21f343081c
refs/heads/master: e21763dbce76d3a07ead438f8811b3e4bce0825b
3 changes: 1 addition & 2 deletions trunk/arch/ia64/kernel/perfmon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit aa795a4

Please sign in to comment.