Hi Kevin, Alex

ARM have released a new version of DS-5 and I have a pull request below to update the version of gator in LSK...

The following changes since commit 715db954c8f2d97a6742ff13be91c99db22135e9:

Merge branch 'lsk-3.10-gator-5.20' into lsk-3.10-gator (2014-10-30 18:07:34 +0000)

are available in the git repository at:

git://git.linaro.org/landing-teams/working/arm/kernel.git

for you to fetch changes up to b93dcce48cc6182fcf66cb6d72665b10c775f4c3:

Merge branch 'lsk-3.10-gator-5.21' into lsk-3.10-gator (2015-05-11 15:07:45 +0100)

---------------------------------------------------------------- Jon Medhurst (4): gator: Version 5.21.1 gator: Add config for building the module in-tree gator: Enable multiple source copies to exist in Android build environments Merge branch 'lsk-3.10-gator-5.21' into lsk-3.10-gator

drivers/gator/{LICENSE => COPYING} | 0 drivers/gator/Makefile | 18 +- drivers/gator/gator.h | 41 +-- drivers/gator/gator_annotate.c | 2 +- drivers/gator/gator_annotate_kernel.c | 2 +- drivers/gator/gator_backtrace.c | 2 +- drivers/gator/gator_buffer.c | 2 +- drivers/gator/gator_buffer_write.c | 2 +- drivers/gator/gator_cookies.c | 2 +- drivers/gator/gator_events_armv6.c | 2 +- drivers/gator/gator_events_armv7.c | 2 +- drivers/gator/gator_events_block.c | 2 +- drivers/gator/gator_events_irq.c | 2 +- drivers/gator/gator_events_l2c-310.c | 2 +- drivers/gator/gator_events_mali_4xx.c | 2 +- drivers/gator/gator_events_mali_4xx.h | 2 +- drivers/gator/gator_events_mali_common.c | 2 +- drivers/gator/gator_events_mali_common.h | 2 +- drivers/gator/gator_events_mali_midgard.c | 2 +- drivers/gator/gator_events_mali_midgard_hw.c | 31 +- drivers/gator/gator_events_mali_midgard_hw_test.c | 2 +- drivers/gator/gator_events_meminfo.c | 5 +- drivers/gator/gator_events_mmapped.c | 2 +- drivers/gator/gator_events_net.c | 2 +- drivers/gator/gator_events_perf_pmu.c | 47 +-- drivers/gator/gator_events_sched.c | 2 +- drivers/gator/gator_events_scorpion.c | 2 +- drivers/gator/gator_hrtimer_gator.c | 2 +- drivers/gator/gator_iks.c | 2 +- drivers/gator/gator_main.c | 42 ++- drivers/gator/gator_marshaling.c | 16 +- drivers/gator/gator_trace_gpu.c | 2 +- drivers/gator/gator_trace_power.c | 10 +- drivers/gator/gator_trace_sched.c | 2 +- drivers/gator/mali/mali_kbase_gator_api.h | 219 ------------- .../gator/mali/mali_mjollnir_profiling_gator_api.h | 2 +- .../gator/mali/mali_utgard_profiling_gator_api.h | 2 +- drivers/gator/mali_midgard.mk | 1 + tools/gator/daemon/Android.mk | 10 +- tools/gator/daemon/AnnotateListener.cpp | 30 +- tools/gator/daemon/AnnotateListener.h | 16 +- tools/gator/daemon/Application.mk | 2 +- tools/gator/daemon/Buffer.cpp | 77 +++-- tools/gator/daemon/Buffer.h | 25 +- tools/gator/daemon/CCNDriver.cpp | 5 +- tools/gator/daemon/CCNDriver.h | 2 +- tools/gator/daemon/COPYING | 339 +++++++++++++++++++++ tools/gator/daemon/CPUFreqDriver.cpp | 58 ---- tools/gator/daemon/CPUFreqDriver.h | 34 --- tools/gator/daemon/CapturedXML.cpp | 5 +- tools/gator/daemon/CapturedXML.h | 2 +- tools/gator/daemon/Child.cpp | 49 +-- tools/gator/daemon/Child.h | 2 +- tools/gator/daemon/Command.cpp | 12 +- tools/gator/daemon/Command.h | 2 +- tools/gator/daemon/Config.h | 2 +- tools/gator/daemon/ConfigurationXML.cpp | 10 +- tools/gator/daemon/ConfigurationXML.h | 2 +- tools/gator/daemon/Counter.h | 2 +- tools/gator/daemon/DiskIODriver.cpp | 20 +- tools/gator/daemon/DiskIODriver.h | 2 +- tools/gator/daemon/Driver.cpp | 2 +- tools/gator/daemon/Driver.h | 2 +- tools/gator/daemon/DriverSource.cpp | 33 +- tools/gator/daemon/DriverSource.h | 2 +- tools/gator/daemon/DynBuf.cpp | 16 +- tools/gator/daemon/DynBuf.h | 2 +- tools/gator/daemon/EventsXML.cpp | 179 ++++++++++- tools/gator/daemon/EventsXML.h | 9 +- tools/gator/daemon/ExternalSource.cpp | 59 ++-- tools/gator/daemon/ExternalSource.h | 3 +- tools/gator/daemon/FSDriver.cpp | 32 +- tools/gator/daemon/FSDriver.h | 2 +- tools/gator/daemon/Fifo.cpp | 6 +- tools/gator/daemon/Fifo.h | 2 +- tools/gator/daemon/FtraceDriver.cpp | 119 ++++++-- tools/gator/daemon/FtraceDriver.h | 4 +- tools/gator/daemon/FtraceSource.cpp | 56 +++- tools/gator/daemon/FtraceSource.h | 2 +- tools/gator/daemon/HwmonDriver.cpp | 158 +++++----- tools/gator/daemon/HwmonDriver.h | 2 +- tools/gator/daemon/KMod.cpp | 6 +- tools/gator/daemon/KMod.h | 2 +- tools/gator/daemon/LocalCapture.cpp | 8 +- tools/gator/daemon/LocalCapture.h | 2 +- tools/gator/daemon/Logging.cpp | 10 +- tools/gator/daemon/Logging.h | 16 +- tools/gator/daemon/MaliVideoDriver.cpp | 4 +- tools/gator/daemon/MaliVideoDriver.h | 2 +- tools/gator/daemon/MemInfoDriver.cpp | 4 +- tools/gator/daemon/MemInfoDriver.h | 2 +- tools/gator/daemon/Monitor.cpp | 20 +- tools/gator/daemon/Monitor.h | 2 +- tools/gator/daemon/NetDriver.cpp | 6 +- tools/gator/daemon/NetDriver.h | 2 +- tools/gator/daemon/OlySocket.cpp | 51 ++-- tools/gator/daemon/OlySocket.h | 8 +- tools/gator/daemon/OlyUtility.cpp | 2 +- tools/gator/daemon/OlyUtility.h | 2 +- tools/gator/daemon/PerfBuffer.cpp | 129 ++++++-- tools/gator/daemon/PerfBuffer.h | 3 +- tools/gator/daemon/PerfDriver.cpp | 180 +++++++---- tools/gator/daemon/PerfDriver.h | 8 +- tools/gator/daemon/PerfGroup.cpp | 234 ++++++++++---- tools/gator/daemon/PerfGroup.h | 23 +- tools/gator/daemon/PerfSource.cpp | 210 +++++++------ tools/gator/daemon/PerfSource.h | 5 +- tools/gator/daemon/Proc.cpp | 62 ++-- tools/gator/daemon/Proc.h | 2 +- tools/gator/daemon/Sender.cpp | 8 +- tools/gator/daemon/Sender.h | 2 +- tools/gator/daemon/SessionData.cpp | 67 ++-- tools/gator/daemon/SessionData.h | 11 +- tools/gator/daemon/SessionXML.cpp | 8 +- tools/gator/daemon/SessionXML.h | 2 +- tools/gator/daemon/Setup.cpp | 202 ++++++++---- tools/gator/daemon/Setup.h | 4 +- tools/gator/daemon/Source.cpp | 4 +- tools/gator/daemon/Source.h | 2 +- tools/gator/daemon/StreamlineSetup.cpp | 22 +- tools/gator/daemon/StreamlineSetup.h | 2 +- tools/gator/daemon/UEvent.cpp | 9 +- tools/gator/daemon/UEvent.h | 2 +- tools/gator/daemon/UserSpaceSource.cpp | 37 +-- tools/gator/daemon/UserSpaceSource.h | 2 +- tools/gator/daemon/c++.cpp | 2 +- tools/gator/daemon/common.mk | 9 +- tools/gator/daemon/defaults.xml | 21 +- tools/gator/daemon/escape.c | 2 +- tools/gator/daemon/events-ARM11.xml | 2 +- tools/gator/daemon/events-CCI-400.xml | 4 +- tools/gator/daemon/events-CCI-500.xml | 75 +++++ tools/gator/daemon/events-Cortex-A15.xml | 100 +++--- tools/gator/daemon/events-Cortex-A17.xml | 79 +++-- tools/gator/daemon/events-Cortex-A5.xml | 52 ++-- tools/gator/daemon/events-Cortex-A53.xml | 117 +++---- tools/gator/daemon/events-Cortex-A57.xml | 58 ++-- tools/gator/daemon/events-Cortex-A7.xml | 65 ++-- tools/gator/daemon/events-Cortex-A72.xml | 87 ++++++ tools/gator/daemon/events-Cortex-A8.xml | 44 +-- tools/gator/daemon/events-Cortex-A9.xml | 66 ++-- tools/gator/daemon/events-Filesystem.xml | 3 +- tools/gator/daemon/events-L2C-310.xml | 4 +- tools/gator/daemon/events-Linux.xml | 4 +- tools/gator/daemon/events-Mali-4xx.xml | 4 +- tools/gator/daemon/events-Mali-Midgard.xml | 17 +- tools/gator/daemon/events-Mali-Midgard_hw.xml | 75 ++--- tools/gator/daemon/events-Mali-T60x_hw.xml | 66 ++-- tools/gator/daemon/events-Mali-T62x_hw.xml | 65 ++-- tools/gator/daemon/events-Mali-T72x_hw.xml | 56 ++-- tools/gator/daemon/events-Mali-T76x_hw.xml | 67 ++-- tools/gator/daemon/events-Mali-T82x_hw.xml | 108 +++++++ tools/gator/daemon/events-Mali-T83x_hw.xml | 108 +++++++ tools/gator/daemon/events-Mali-T86x_hw.xml | 117 +++++++ tools/gator/daemon/events-Mali-T88x_hw.xml | 117 +++++++ tools/gator/daemon/events-Other.xml | 33 ++ tools/gator/daemon/events-ftrace.xml | 21 +- tools/gator/daemon/main.cpp | 100 ++++-- 158 files changed, 3267 insertions(+), 1752 deletions(-) rename drivers/gator/{LICENSE => COPYING} (100%) delete mode 100644 drivers/gator/mali/mali_kbase_gator_api.h create mode 100644 tools/gator/daemon/COPYING delete mode 100644 tools/gator/daemon/CPUFreqDriver.cpp delete mode 100644 tools/gator/daemon/CPUFreqDriver.h create mode 100644 tools/gator/daemon/events-CCI-500.xml create mode 100644 tools/gator/daemon/events-Cortex-A72.xml create mode 100644 tools/gator/daemon/events-Mali-T82x_hw.xml create mode 100644 tools/gator/daemon/events-Mali-T83x_hw.xml create mode 100644 tools/gator/daemon/events-Mali-T86x_hw.xml create mode 100644 tools/gator/daemon/events-Mali-T88x_hw.xml create mode 100644 tools/gator/daemon/events-Other.xml