tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Staging: android: binder: Fix gcc warnings about improper format specifiers for size_t in printk

Use the proper format specifiers for printing size_t values.

Signed-off-by: J.R. Mauro <jrm8005@gmail.com>
Cc: Arve Hjønnevåg <arve@android.com>
Cc: Brian Swetland <swetland@google.com>
Cc: Robert Love <rlove@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

authored by

J.R. Mauro and committed by
Greg Kroah-Hartman a2bf2153 457b9a6f

+26 -23
+26 -23
drivers/staging/android/binder.c
··· 493 493 new_buffer_size = binder_buffer_size(proc, new_buffer); 494 494 495 495 if (binder_debug_mask & BINDER_DEBUG_BUFFER_ALLOC) 496 - printk(KERN_INFO "binder: %d: add free buffer, size %d, " 496 + printk(KERN_INFO "binder: %d: add free buffer, size %zd, " 497 497 "at %p\n", proc->pid, new_buffer_size, new_buffer); 498 498 499 499 while (*p) { ··· 679 679 680 680 if (size < data_size || size < offsets_size) { 681 681 binder_user_error("binder: %d: got transaction with invalid " 682 - "size %d-%d\n", proc->pid, data_size, offsets_size); 682 + "size %zd-%zd\n", proc->pid, data_size, offsets_size); 683 683 return NULL; 684 684 } 685 685 686 686 if (is_async && 687 687 proc->free_async_space < size + sizeof(struct binder_buffer)) { 688 688 if (binder_debug_mask & BINDER_DEBUG_BUFFER_ALLOC) 689 - printk(KERN_ERR "binder: %d: binder_alloc_buf size %d f" 689 + printk(KERN_ERR "binder: %d: binder_alloc_buf size %zd f" 690 690 "ailed, no async space left\n", proc->pid, size); 691 691 return NULL; 692 692 } ··· 707 707 } 708 708 } 709 709 if (best_fit == NULL) { 710 - printk(KERN_ERR "binder: %d: binder_alloc_buf size %d failed, " 710 + printk(KERN_ERR "binder: %d: binder_alloc_buf size %zd failed, " 711 711 "no address space\n", proc->pid, size); 712 712 return NULL; 713 713 } ··· 716 716 buffer_size = binder_buffer_size(proc, buffer); 717 717 } 718 718 if (binder_debug_mask & BINDER_DEBUG_BUFFER_ALLOC) 719 - printk(KERN_INFO "binder: %d: binder_alloc_buf size %d got buff" 720 - "er %p size %d\n", proc->pid, size, buffer, buffer_size); 719 + printk(KERN_INFO "binder: %d: binder_alloc_buf size %zd got buff" 720 + "er %p size %zd\n", proc->pid, size, buffer, buffer_size); 721 721 722 722 has_page_addr = 723 723 (void *)(((size_t)buffer->data + buffer_size) & PAGE_MASK); ··· 744 744 binder_insert_free_buffer(proc, new_buffer); 745 745 } 746 746 if (binder_debug_mask & BINDER_DEBUG_BUFFER_ALLOC) 747 - printk(KERN_INFO "binder: %d: binder_alloc_buf size %d got " 747 + printk(KERN_INFO "binder: %d: binder_alloc_buf size %zd got " 748 748 "%p\n", proc->pid, size, buffer); 749 749 buffer->data_size = data_size; 750 750 buffer->offsets_size = offsets_size; ··· 752 752 if (is_async) { 753 753 proc->free_async_space -= size + sizeof(struct binder_buffer); 754 754 if (binder_debug_mask & BINDER_DEBUG_BUFFER_ALLOC_ASYNC) 755 - printk(KERN_INFO "binder: %d: binder_alloc_buf size %d " 756 - "async free %d\n", proc->pid, size, 755 + printk(KERN_INFO "binder: %d: binder_alloc_buf size %zd " 756 + "async free %zd\n", proc->pid, size, 757 757 proc->free_async_space); 758 758 } 759 759 ··· 827 827 size = ALIGN(buffer->data_size, sizeof(void *)) + 828 828 ALIGN(buffer->offsets_size, sizeof(void *)); 829 829 if (binder_debug_mask & BINDER_DEBUG_BUFFER_ALLOC) 830 - printk(KERN_INFO "binder: %d: binder_free_buf %p size %d buffer" 831 - "_size %d\n", proc->pid, buffer, size, buffer_size); 830 + printk(KERN_INFO "binder: %d: binder_free_buf %p size %zd buffer" 831 + "_size %zd\n", proc->pid, buffer, size, buffer_size); 832 832 833 833 BUG_ON(buffer->free); 834 834 BUG_ON(size > buffer_size); ··· 839 839 if (buffer->async_transaction) { 840 840 proc->free_async_space += size + sizeof(struct binder_buffer); 841 841 if (binder_debug_mask & BINDER_DEBUG_BUFFER_ALLOC_ASYNC) 842 - printk(KERN_INFO "binder: %d: binder_free_buf size %d " 843 - "async free %d\n", proc->pid, size, 842 + printk(KERN_INFO "binder: %d: binder_free_buf size %zd " 843 + "async free %zd\n", proc->pid, size, 844 844 proc->free_async_space); 845 845 } 846 846 ··· 1383 1383 if (binder_debug_mask & BINDER_DEBUG_TRANSACTION) { 1384 1384 if (reply) 1385 1385 printk(KERN_INFO "binder: %d:%d BC_REPLY %d -> %d:%d, " 1386 - "data %p-%p size %d-%d\n", 1386 + "data %p-%p size %zd-%zd\n", 1387 1387 proc->pid, thread->pid, t->debug_id, 1388 1388 target_proc->pid, target_thread->pid, 1389 1389 tr->data.ptr.buffer, tr->data.ptr.offsets, 1390 1390 tr->data_size, tr->offsets_size); 1391 1391 else 1392 1392 printk(KERN_INFO "binder: %d:%d BC_TRANSACTION %d -> " 1393 - "%d - node %d, data %p-%p size %d-%d\n", 1393 + "%d - node %d, data %p-%p size %zd-%zd\n", 1394 1394 proc->pid, thread->pid, t->debug_id, 1395 1395 target_proc->pid, target_node->debug_id, 1396 1396 tr->data.ptr.buffer, tr->data.ptr.offsets, ··· 1439 1439 struct flat_binder_object *fp; 1440 1440 if (*offp > t->buffer->data_size - sizeof(*fp)) { 1441 1441 binder_user_error("binder: %d:%d got transaction with " 1442 - "invalid offset, %d\n", 1442 + "invalid offset, %zd\n", 1443 1443 proc->pid, thread->pid, *offp); 1444 1444 return_error = BR_FAILED_REPLY; 1445 1445 goto err_bad_offset; ··· 1615 1615 err_invalid_target_handle: 1616 1616 err_no_context_mgr_node: 1617 1617 if (binder_debug_mask & BINDER_DEBUG_FAILED_TRANSACTION) 1618 - printk(KERN_INFO "binder: %d:%d transaction failed %d, size %d-%d\n", 1618 + printk(KERN_INFO "binder: %d:%d transaction failed %d, size" 1619 + "%zd-%zd\n", 1619 1620 proc->pid, thread->pid, return_error, 1620 1621 tr->data_size, tr->offsets_size); 1621 1622 ··· 1641 1640 int debug_id = buffer->debug_id; 1642 1641 1643 1642 if (binder_debug_mask & BINDER_DEBUG_TRANSACTION) 1644 - printk(KERN_INFO "binder: %d buffer release %d, size %d-%d, failed at %p\n", 1643 + printk(KERN_INFO "binder: %d buffer release %d, size %zd-%zd, failed at %p\n", 1645 1644 proc->pid, buffer->debug_id, 1646 1645 buffer->data_size, buffer->offsets_size, failed_at); 1647 1646 ··· 1656 1655 for (; offp < off_end; offp++) { 1657 1656 struct flat_binder_object *fp; 1658 1657 if (*offp > buffer->data_size - sizeof(*fp)) { 1659 - printk(KERN_ERR "binder: transaction release %d bad offset %d, size %d\n", debug_id, *offp, buffer->data_size); 1658 + printk(KERN_ERR "binder: transaction release %d bad" 1659 + "offset %zd, size %zd\n", debug_id, *offp, buffer->data_size); 1660 1660 continue; 1661 1661 } 1662 1662 fp = (struct flat_binder_object *)(buffer->data + *offp); ··· 2352 2350 2353 2351 binder_stat_br(proc, thread, cmd); 2354 2352 if (binder_debug_mask & BINDER_DEBUG_TRANSACTION) 2355 - printk(KERN_INFO "binder: %d:%d %s %d %d:%d, cmd %d size %d-%d ptr %p-%p\n", 2353 + printk(KERN_INFO "binder: %d:%d %s %d %d:%d, cmd %d" 2354 + "size %zd-%zd ptr %p-%p\n", 2356 2355 proc->pid, thread->pid, 2357 2356 (cmd == BR_TRANSACTION) ? "BR_TRANSACTION" : "BR_REPLY", 2358 2357 t->debug_id, t->from ? t->from->proc->pid : 0, ··· 2932 2929 if (buf >= end) 2933 2930 return buf; 2934 2931 } 2935 - buf += snprintf(buf, end - buf, " size %d:%d data %p\n", 2932 + buf += snprintf(buf, end - buf, " size %zd:%zd data %p\n", 2936 2933 t->buffer->data_size, t->buffer->offsets_size, 2937 2934 t->buffer->data); 2938 2935 return buf; ··· 2940 2937 2941 2938 static char *print_binder_buffer(char *buf, char *end, const char *prefix, struct binder_buffer *buffer) 2942 2939 { 2943 - buf += snprintf(buf, end - buf, "%s %d: %p size %d:%d %s\n", 2940 + buf += snprintf(buf, end - buf, "%s %d: %p size %zd:%zd %s\n", 2944 2941 prefix, buffer->debug_id, buffer->data, 2945 2942 buffer->data_size, buffer->offsets_size, 2946 2943 buffer->transaction ? "active" : "delivered"); ··· 3210 3207 return buf; 3211 3208 buf += snprintf(buf, end - buf, " requested threads: %d+%d/%d\n" 3212 3209 " ready threads %d\n" 3213 - " free async space %d\n", proc->requested_threads, 3210 + " free async space %zd\n", proc->requested_threads, 3214 3211 proc->requested_threads_started, proc->max_threads, 3215 3212 proc->ready_threads, proc->free_async_space); 3216 3213 if (buf >= end)