lkml.org 
[lkml]   [2010]   [Jan]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 04/10] perf_event: x86: Fixup weight tying 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>
    LKML-Reference: <new-submission>
    ---
    arch/x86/kernel/cpu/perf_event.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    Index: linux-2.6/arch/x86/kernel/cpu/perf_event.c
    ===================================================================
    --- linux-2.6.orig/arch/x86/kernel/cpu/perf_event.c
    +++ linux-2.6/arch/x86/kernel/cpu/perf_event.c
    @@ -1235,7 +1235,7 @@ static int x86_schedule_events(struct cp
    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;

    @@ -1252,7 +1252,7 @@ static int x86_schedule_events(struct cp
    */
    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)
    @@ -1309,7 +1309,7 @@ static int x86_schedule_events(struct cp
    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-22 17:05    [W:0.021 / U:149.244 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site