diff options
| author | Robert Richter <robert.richter@amd.com> | 2010-02-25 20:20:25 +0100 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2010-02-26 15:20:03 +0100 |
| commit | c17c8fbf349482e89b57d1b800e83e9f4cf40c47 (patch) | |
| tree | 69378aca16c1837035daab36fa146382fb61bb9d /arch/x86/oprofile/nmi_int.c | |
| parent | oprofile/x86: fix perfctr nmi reservation for mulitplexing (diff) | |
| download | linux-c17c8fbf349482e89b57d1b800e83e9f4cf40c47.tar.xz linux-c17c8fbf349482e89b57d1b800e83e9f4cf40c47.zip | |
oprofile/x86: use kzalloc() instead of kmalloc()
Cc: stable@kernel.org
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/x86/oprofile/nmi_int.c')
| -rw-r--r-- | arch/x86/oprofile/nmi_int.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c index 7170d1e29896..2c505ee71014 100644 --- a/arch/x86/oprofile/nmi_int.c +++ b/arch/x86/oprofile/nmi_int.c @@ -159,7 +159,7 @@ static int nmi_setup_mux(void) for_each_possible_cpu(i) { per_cpu(cpu_msrs, i).multiplex = - kmalloc(multiplex_size, GFP_KERNEL); + kzalloc(multiplex_size, GFP_KERNEL); if (!per_cpu(cpu_msrs, i).multiplex) return 0; } @@ -304,11 +304,11 @@ static int allocate_msrs(void) int i; for_each_possible_cpu(i) { - per_cpu(cpu_msrs, i).counters = kmalloc(counters_size, + per_cpu(cpu_msrs, i).counters = kzalloc(counters_size, GFP_KERNEL); if (!per_cpu(cpu_msrs, i).counters) return 0; - per_cpu(cpu_msrs, i).controls = kmalloc(controls_size, + per_cpu(cpu_msrs, i).controls = kzalloc(controls_size, GFP_KERNEL); if (!per_cpu(cpu_msrs, i).controls) return 0; |