git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
ia64
/
kernel
/
perfmon.c
diff --git
a/arch/ia64/kernel/perfmon.c
b/arch/ia64/kernel/perfmon.c
index
f099b82
..
d92d5b5
100644
(file)
--- a/
arch/ia64/kernel/perfmon.c
+++ b/
arch/ia64/kernel/perfmon.c
@@
-829,10
+829,9
@@
pfm_rvmalloc(unsigned long size)
unsigned long addr;
size = PAGE_ALIGN(size);
unsigned long addr;
size = PAGE_ALIGN(size);
- mem = v
m
alloc(size);
+ mem = v
z
alloc(size);
if (mem) {
//printk("perfmon: CPU%d pfm_rvmalloc(%ld)=%p\n", smp_processor_id(), size, mem);
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);
addr = (unsigned long)mem;
while (size > 0) {
pfm_reserve_page(addr);