summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-11-23 12:16:57 +0100
committerIngo Molnar <mingo@elte.hu>2008-11-23 12:16:57 +0100
commit3d994e107694381f5b8b2f5cd9fdc4fcf04a5b79 (patch)
treeeb47a045c623d3e55e508c26e337037ae3245856 /arch/x86
parenta1967d64414dab500e86cbbddf8eae6ad2047903 (diff)
parenta4a16beadea041ab601e65b264b568e8b6b4f68d (diff)
downloadlinux-3d994e107694381f5b8b2f5cd9fdc4fcf04a5b79.tar.bz2
Merge branch 'oprofile-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into x86/urgent
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/oprofile/op_model_ppro.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
index 3f1b81a83e2e..716d26f0e5d4 100644
--- a/arch/x86/oprofile/op_model_ppro.c
+++ b/arch/x86/oprofile/op_model_ppro.c
@@ -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;