lkml.org 
[lkml]   [2010]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf_event: x86: Fixup constraints typing issue
    Commit-ID:  81269a085669b5130058a0275aa7ba9f94abd1fa
    Gitweb: http://git.kernel.org/tip/81269a085669b5130058a0275aa7ba9f94abd1fa
    Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
    AuthorDate: Fri, 22 Jan 2010 14:55:22 +0100
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Fri, 29 Jan 2010 09:01:36 +0100

    perf_event: x86: Fixup constraints typing issue

    Constraints gets defined an u64 but in long quantities and then cast to
    long.

    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Stephane Eranian <eranian@google.com>
    LKML-Reference: <20100122155535.504916780@chello.nl>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/x86/kernel/cpu/perf_event.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
    index 7bd359a..7e181a5 100644
    --- a/arch/x86/kernel/cpu/perf_event.c
    +++ b/arch/x86/kernel/cpu/perf_event.c
    @@ -1232,7 +1232,7 @@ static int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
    int i, j , w, num;
    int weight, wmax;
    unsigned long *c;
    - u64 constraints[X86_PMC_IDX_MAX][BITS_TO_LONGS(X86_PMC_IDX_MAX)];
    + unsigned long constraints[X86_PMC_IDX_MAX][BITS_TO_LONGS(X86_PMC_IDX_MAX)];
    unsigned long used_mask[BITS_TO_LONGS(X86_PMC_IDX_MAX)];
    struct hw_perf_event *hwc;

    @@ -1249,7 +1249,7 @@ static int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
    */
    for (i = 0, num = n; i < n; i++, num--) {
    hwc = &cpuc->event_list[i]->hw;
    - c = (unsigned long *)constraints[i];
    + c = constraints[i];

    /* never assigned */
    if (hwc->idx == -1)
    @@ -1306,7 +1306,7 @@ static int x86_schedule_events(struct cpu_hw_events *cpuc, int n, int *assign)
    for (w = 1, num = n; num && w <= wmax; w++) {
    /* for each event */
    for (i = 0; num && i < n; i++) {
    - c = (unsigned long *)constraints[i];
    + c = constraints[i];
    hwc = &cpuc->event_list[i]->hw;

    weight = bitmap_weight(c, X86_PMC_IDX_MAX);

    \
     
     \ /
      Last update: 2010-01-29 10:29    [W:0.031 / U:65.260 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site