Commit b5693964 authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Greg Kroah-Hartman

staging: android: ion: fix some format strings

C99 says that a precision which is simply '.' with no following digits
or * should be interpreted as 0, which means that these format strings
actually mean 'print 16 spaces'. However, the kernel's printf
implementation treats this case as if the precision was omitted. Don't
rely on that quirk.
Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d9dfb48f
...@@ -1395,7 +1395,7 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused) ...@@ -1395,7 +1395,7 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
size_t total_size = 0; size_t total_size = 0;
size_t total_orphaned_size = 0; size_t total_orphaned_size = 0;
seq_printf(s, "%16.s %16.s %16.s\n", "client", "pid", "size"); seq_printf(s, "%16s %16s %16s\n", "client", "pid", "size");
seq_puts(s, "----------------------------------------------------\n"); seq_puts(s, "----------------------------------------------------\n");
for (n = rb_first(&dev->clients); n; n = rb_next(n)) { for (n = rb_first(&dev->clients); n; n = rb_next(n)) {
...@@ -1409,10 +1409,10 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused) ...@@ -1409,10 +1409,10 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
char task_comm[TASK_COMM_LEN]; char task_comm[TASK_COMM_LEN];
get_task_comm(task_comm, client->task); get_task_comm(task_comm, client->task);
seq_printf(s, "%16.s %16u %16zu\n", task_comm, seq_printf(s, "%16s %16u %16zu\n", task_comm,
client->pid, size); client->pid, size);
} else { } else {
seq_printf(s, "%16.s %16u %16zu\n", client->name, seq_printf(s, "%16s %16u %16zu\n", client->name,
client->pid, size); client->pid, size);
} }
} }
...@@ -1426,7 +1426,7 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused) ...@@ -1426,7 +1426,7 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
continue; continue;
total_size += buffer->size; total_size += buffer->size;
if (!buffer->handle_count) { if (!buffer->handle_count) {
seq_printf(s, "%16.s %16u %16zu %d %d\n", seq_printf(s, "%16s %16u %16zu %d %d\n",
buffer->task_comm, buffer->pid, buffer->task_comm, buffer->pid,
buffer->size, buffer->kmap_cnt, buffer->size, buffer->kmap_cnt,
atomic_read(&buffer->ref.refcount)); atomic_read(&buffer->ref.refcount));
...@@ -1435,11 +1435,11 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused) ...@@ -1435,11 +1435,11 @@ static int ion_debug_heap_show(struct seq_file *s, void *unused)
} }
mutex_unlock(&dev->buffer_lock); mutex_unlock(&dev->buffer_lock);
seq_puts(s, "----------------------------------------------------\n"); seq_puts(s, "----------------------------------------------------\n");
seq_printf(s, "%16.s %16zu\n", "total orphaned", seq_printf(s, "%16s %16zu\n", "total orphaned",
total_orphaned_size); total_orphaned_size);
seq_printf(s, "%16.s %16zu\n", "total ", total_size); seq_printf(s, "%16s %16zu\n", "total ", total_size);
if (heap->flags & ION_HEAP_FLAG_DEFER_FREE) if (heap->flags & ION_HEAP_FLAG_DEFER_FREE)
seq_printf(s, "%16.s %16zu\n", "deferred free", seq_printf(s, "%16s %16zu\n", "deferred free",
heap->free_list_size); heap->free_list_size);
seq_puts(s, "----------------------------------------------------\n"); seq_puts(s, "----------------------------------------------------\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment