lkml.org 
[lkml]   [2013]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 56/62] events: convert to idr_alloc()
    Date
    Convert to the much saner new idr interface.

    Only compile tested.

    Signed-off-by: Tejun Heo <tj@kernel.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Ingo Molnar <mingo@redhat.com>
    Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
    ---
    This patch depends on an earlier idr changes and I think it would be
    best to route these together through -mm. Please holler if there's
    any objection. Thanks.

    kernel/events/core.c | 10 +++-------
    1 file changed, 3 insertions(+), 7 deletions(-)

    diff --git a/kernel/events/core.c b/kernel/events/core.c
    index 301079d..2ed1e98 100644
    --- a/kernel/events/core.c
    +++ b/kernel/events/core.c
    @@ -5956,13 +5956,9 @@ int perf_pmu_register(struct pmu *pmu, char *name, int type)
    pmu->name = name;

    if (type < 0) {
    - int err = idr_pre_get(&pmu_idr, GFP_KERNEL);
    - if (!err)
    - goto free_pdc;
    -
    - err = idr_get_new_above(&pmu_idr, pmu, PERF_TYPE_MAX, &type);
    - if (err) {
    - ret = err;
    + type = idr_alloc(&pmu_idr, pmu, PERF_TYPE_MAX, 0, GFP_KERNEL);
    + if (type < 0) {
    + ret = type;
    goto free_pdc;
    }
    }
    --
    1.8.1


    \
     
     \ /
      Last update: 2013-02-03 03:41    [W:5.194 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site