lkml.org 
[lkml]   [2012]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 39/68] oprofile: perf: use NR_CPUS instead or nr_cpumask_bits for static array
    Date
    From: Greg KH <gregkh@linuxfoundation.org>

    3.0-stable review patch. If anyone has any objections, please let me know.

    ------------------

    From: Will Deacon <will.deacon@arm.com>

    commit e734568b675c985db2026848fefaac01c22977a5 upstream.

    The OProfile perf backend uses a static array to keep track of the
    perf events on the system. When compiling with CONFIG_CPUMASK_OFFSTACK=y
    && SMP, nr_cpumask_bits is not a compile-time constant and the build
    will fail with:

    oprofile_perf.c:28: error: variably modified 'perf_events' at file scope

    This patch uses NR_CPUs instead of nr_cpumask_bits for the array
    initialisation. If this causes space problems in the future, we can
    always move to dynamic allocation for the events array.

    Cc: Matt Fleming <matt@console-pimps.org>
    Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Robert Richter <robert.richter@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/oprofile/oprofile_perf.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/oprofile/oprofile_perf.c
    +++ b/drivers/oprofile/oprofile_perf.c
    @@ -25,7 +25,7 @@ static int oprofile_perf_enabled;
    static DEFINE_MUTEX(oprofile_perf_mutex);

    static struct op_counter_config *counter_config;
    -static struct perf_event **perf_events[nr_cpumask_bits];
    +static struct perf_event **perf_events[NR_CPUS];
    static int num_counters;

    /*



    \
     
     \ /
      Last update: 2012-07-13 02:01    [W:4.343 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site