Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent

This commit is contained in:
Ingo Molnar 2008-11-23 12:16:57 +01:00
commit 3d994e1076

View File

@ -69,7 +69,7 @@ static void ppro_setup_ctrs(struct op_msrs const * const msrs)
int i;
if (!reset_value) {
reset_value = kmalloc(sizeof(unsigned) * num_counters,
reset_value = kmalloc(sizeof(reset_value[0]) * num_counters,
GFP_ATOMIC);
if (!reset_value)
return;