lkml.org 
[lkml]   [2010]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 11/15] oprofile/x86: use kzalloc() instead of kmalloc()
    Date
    Cc: stable@kernel.org
    Signed-off-by: Robert Richter <robert.richter@amd.com>
    ---
    arch/x86/oprofile/nmi_int.c | 6 +++---
    arch/x86/oprofile/op_model_amd.c | 4 ----
    arch/x86/oprofile/op_model_p4.c | 6 ------
    arch/x86/oprofile/op_model_ppro.c | 6 +-----
    4 files changed, 4 insertions(+), 18 deletions(-)

    diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
    index 7170d1e..2c505ee 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;
    diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
    index 2aab018..f4ebc45 100644
    --- a/arch/x86/oprofile/op_model_amd.c
    +++ b/arch/x86/oprofile/op_model_amd.c
    @@ -147,15 +147,11 @@ static void op_amd_fill_in_addresses(struct op_msrs * const msrs)
    for (i = 0; i < NUM_COUNTERS; i++) {
    if (reserve_perfctr_nmi(MSR_K7_PERFCTR0 + i))
    msrs->counters[i].addr = MSR_K7_PERFCTR0 + i;
    - else
    - msrs->counters[i].addr = 0;
    }

    for (i = 0; i < NUM_CONTROLS; i++) {
    if (reserve_evntsel_nmi(MSR_K7_EVNTSEL0 + i))
    msrs->controls[i].addr = MSR_K7_EVNTSEL0 + i;
    - else
    - msrs->controls[i].addr = 0;
    }
    }

    diff --git a/arch/x86/oprofile/op_model_p4.c b/arch/x86/oprofile/op_model_p4.c
    index ac6b354..e6a160a 100644
    --- a/arch/x86/oprofile/op_model_p4.c
    +++ b/arch/x86/oprofile/op_model_p4.c
    @@ -394,12 +394,6 @@ static void p4_fill_in_addresses(struct op_msrs * const msrs)
    setup_num_counters();
    stag = get_stagger();

    - /* initialize some registers */
    - for (i = 0; i < num_counters; ++i)
    - msrs->counters[i].addr = 0;
    - for (i = 0; i < num_controls; ++i)
    - msrs->controls[i].addr = 0;
    -
    /* the counter & cccr registers we pay attention to */
    for (i = 0; i < num_counters; ++i) {
    addr = p4_counters[VIRT_CTR(stag, i)].counter_address;
    diff --git a/arch/x86/oprofile/op_model_ppro.c b/arch/x86/oprofile/op_model_ppro.c
    index c344525..5d1727b 100644
    --- a/arch/x86/oprofile/op_model_ppro.c
    +++ b/arch/x86/oprofile/op_model_ppro.c
    @@ -37,15 +37,11 @@ static void ppro_fill_in_addresses(struct op_msrs * const msrs)
    for (i = 0; i < num_counters; i++) {
    if (reserve_perfctr_nmi(MSR_P6_PERFCTR0 + i))
    msrs->counters[i].addr = MSR_P6_PERFCTR0 + i;
    - else
    - msrs->counters[i].addr = 0;
    }

    for (i = 0; i < num_counters; i++) {
    if (reserve_evntsel_nmi(MSR_P6_EVNTSEL0 + i))
    msrs->controls[i].addr = MSR_P6_EVNTSEL0 + i;
    - else
    - msrs->controls[i].addr = 0;
    }
    }

    @@ -57,7 +53,7 @@ static void ppro_setup_ctrs(struct op_x86_model_spec const *model,
    int i;

    if (!reset_value) {
    - reset_value = kmalloc(sizeof(reset_value[0]) * num_counters,
    + reset_value = kzalloc(sizeof(reset_value[0]) * num_counters,
    GFP_ATOMIC);
    if (!reset_value)
    return;
    --
    1.6.6



    \
     
     \ /
      Last update: 2010-02-26 18:43    [W:0.030 / U:65.228 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site