Commit 3d994e10 authored by Ingo Molnar's avatar Ingo Molnar

Merge branch 'oprofile-for-tip' of...

Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent
parents a1967d64 a4a16bea
...@@ -69,7 +69,7 @@ static void ppro_setup_ctrs(struct op_msrs const * const msrs) ...@@ -69,7 +69,7 @@ static void ppro_setup_ctrs(struct op_msrs const * const msrs)
int i; int i;
if (!reset_value) { if (!reset_value) {
reset_value = kmalloc(sizeof(unsigned) * num_counters, reset_value = kmalloc(sizeof(reset_value[0]) * num_counters,
GFP_ATOMIC); GFP_ATOMIC);
if (!reset_value) if (!reset_value)
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment