Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25c5b36a authored by Jesse Hall's avatar Jesse Hall Committed by android-build-merger
Browse files

Merge "Update fence event path for kernel 4.10+" am: f3e024a0 am: 48061041 

am: f33fe4c7

Change-Id: Ie9816acdeabf413378ed2a2bc2a299dfeeff2492
parents cb20ccaa f33fe4c7

cmds/atrace/atrace.cpp

+4 −2
Original line number Diff line number Diff line
@@ -193,10 +193,12 @@ static const TracingCategory k_categories[] = { 
        { REQ,      "events/cpufreq_interactive/enable" },

    } },

    { "sync",       "Synchronization",  0, {

        // before linux kernel 4.9

        // linux kernel < 4.9

        { OPT,      "events/sync/enable" },

        // starting in linux kernel 4.9

        // linux kernel == 4.9.x

        { OPT,      "events/fence/enable" },

        // linux kernel > 4.9

        { OPT,      "events/dma_fence/enable" },

    } },

    { "workq",      "Kernel Workqueues", 0, {

        { REQ,      "events/workqueue/enable" },

cmds/atrace/atrace.rc

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ on late-init 
    chmod 0666 /sys/kernel/tracing/events/sync/enable

    chmod 0666 /sys/kernel/debug/tracing/events/fence/enable

    chmod 0666 /sys/kernel/tracing/events/fence/enable

    chmod 0666 /sys/kernel/debug/tracing/events/dma_fence/enable

    chmod 0666 /sys/kernel/tracing/events/dma_fence/enable

    chmod 0666 /sys/kernel/debug/tracing/events/kmem/rss_stat/enable

    chmod 0666 /sys/kernel/tracing/events/kmem/rss_stat/enable

    chmod 0666 /sys/kernel/debug/tracing/events/kmem/ion_heap_grow/enable