diff options
| author | Jon Medhurst <tixy@linaro.org> | 2015-01-21 08:50:34 +0000 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2015-01-21 08:50:34 +0000 |
| commit | 12bd0565a05db3ee0b1871b1727c1cb1eef5ac6e (patch) | |
| tree | a145e51228cef13396a9fd30f4ad5daf496d05f0 | |
| parent | 3864fdfd6177460aad802ef1cea4161b4a86e93e (diff) | |
| parent | 1ce9a9f7b1ff940a2971d623f2280e226950ff0b (diff) | |
Merge branch 'lsk-3.10-armlt-mali' into integration-lsk-3.10-juno-androidlsk-3.10-armlt-juno-20150121
| -rw-r--r-- | drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/arm/midgard/mali_kbase_sync.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c index 92422e638979..f78910668216 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c +++ b/drivers/gpu/arm/midgard/mali_kbase_jd_debugfs.c @@ -65,7 +65,7 @@ static int kbasep_jd_debugfs_atoms_show(struct seq_file *sfile, void *data) ktime_sub(ktime_get(), atom->start_timestamp)); seq_printf(sfile, - "%i,%u,%u,%u,%u %u,%lli,%llu\n", + "%i,%u,%u,%u,%lu %lu,%lli,%llu\n", i, atom->core_req, atom->status, atom->coreref_state, atom->dep[0].atom ? atom->dep[0].atom - atoms : 0, atom->dep[1].atom ? atom->dep[1].atom - atoms : 0, diff --git a/drivers/gpu/arm/midgard/mali_kbase_sync.c b/drivers/gpu/arm/midgard/mali_kbase_sync.c index 506b397176f6..13b194732d50 100644 --- a/drivers/gpu/arm/midgard/mali_kbase_sync.c +++ b/drivers/gpu/arm/midgard/mali_kbase_sync.c @@ -23,7 +23,7 @@ */ #ifdef CONFIG_SYNC - +struct seq_file; #include "sync.h" #include <mali_kbase.h> |