The following changes since commit 01239d6842a2e2653b7b42736cf2c10b69d0face:
Merge in gator version 5.16 (2013-10-11 12:53:06 +0100)
are available in the git repository at:
git://git.linaro.org/landing-teams/working/arm/kernel.git lsk-3.10-gator
for you to fetch changes up to dffc698f098d93044e28f4f97206eca6373c7cdf:
Merge in gator version 5.17 (2013-12-19 09:36:46 +0000)
----------------------------------------------------------------
Drew Richardson (1): gator-driver: Handle task struct correctly
Jon Medhurst (4): gator: Version 5.17 gator: Revert #error about lack of CONFIG_PERF_EVENTS gator: Add config for building the module in-tree Merge in gator version 5.17
drivers/gator/Makefile | 64 ++--- drivers/gator/gator.h | 6 +- drivers/gator/gator_annotate_kernel.c | 107 ++++--- drivers/gator/gator_backtrace.c | 10 +- drivers/gator/gator_cookies.c | 102 ++++--- drivers/gator/gator_events.sh | 19 -- drivers/gator/gator_events_armv6.c | 7 - drivers/gator/gator_events_armv7.c | 7 - drivers/gator/gator_events_block.c | 2 - drivers/gator/gator_events_ccn-504.c | 192 ++++++++----- drivers/gator/gator_events_irq.c | 2 - drivers/gator/gator_events_l2c-310.c | 2 - drivers/gator/gator_events_mali_4xx.c | 30 +- drivers/gator/gator_events_mali_common.c | 9 +- drivers/gator/gator_events_mali_common.h | 4 +- drivers/gator/gator_events_mali_t6xx.c | 60 +++- drivers/gator/gator_events_mali_t6xx_hw.c | 46 ++- drivers/gator/gator_events_meminfo.c | 301 +++++++++++++++----- ...ator_events_mmaped.c => gator_events_mmapped.c} | 124 ++++---- drivers/gator/gator_events_net.c | 5 +- drivers/gator/gator_events_perf_pmu.c | 83 +++++- drivers/gator/gator_events_sched.c | 2 - drivers/gator/gator_events_scorpion.c | 7 - drivers/gator/gator_iks.c | 2 + drivers/gator/gator_main.c | 108 ++++++- drivers/gator/gator_marshaling.c | 19 ++ drivers/gator/gator_trace_gpu.c | 6 +- drivers/gator/gator_trace_sched.c | 20 +- .../gator/mali/mali_mjollnir_profiling_gator_api.h | 15 +- .../gator/mali/mali_utgard_profiling_gator_api.h | 15 +- drivers/gator/mali_t6xx.mk | 11 +- tools/gator/daemon/Buffer.cpp | 11 + tools/gator/daemon/Buffer.h | 5 + tools/gator/daemon/Child.cpp | 13 +- tools/gator/daemon/Child.h | 4 + tools/gator/daemon/ConfigurationXML.h | 4 + tools/gator/daemon/Driver.h | 6 +- tools/gator/daemon/Fifo.h | 4 + tools/gator/daemon/Hwmon.cpp | 4 + tools/gator/daemon/Hwmon.h | 4 + tools/gator/daemon/OlySocket.cpp | 23 +- tools/gator/daemon/Sender.h | 4 + tools/gator/daemon/SessionData.cpp | 12 +- tools/gator/daemon/SessionData.h | 6 +- tools/gator/daemon/SessionXML.h | 4 + tools/gator/daemon/StreamlineSetup.h | 4 + tools/gator/daemon/common.mk | 2 +- tools/gator/daemon/events-CCI-400.xml | 62 +++- tools/gator/daemon/events-Linux.xml | 10 +- tools/gator/daemon/events-Mali-T6xx.xml | 10 + tools/gator/daemon/events-Mali-T6xx_hw.xml | 5 +- tools/gator/daemon/main.cpp | 25 +- 52 files changed, 1102 insertions(+), 507 deletions(-) delete mode 100755 drivers/gator/gator_events.sh rename drivers/gator/{gator_events_mmaped.c => gator_events_mmapped.c} (56%)