diff options
| author | John Stultz <john.stultz@linaro.org> | 2013-08-05 20:00:27 -0700 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2013-08-05 20:00:27 -0700 |
| commit | 67f5af793504cd876be13b09ddc3a125d1052166 (patch) | |
| tree | 3ed6fb341da34edc5ba8b0bfb814f973b818b00f | |
| parent | 3e9c09935b05d3c5d3b03637a4a3efc3a38a14b4 (diff) | |
| parent | 80475b849b90d8bed1fe768c496280f4b5c11410 (diff) | |
Merge branch 'linaro-fixes/experimental/android-3.10' into linaro-android-3.11-experimental-mergetracking-linaro-android-3.11-llct-20130820.0tracking-linaro-android-3.11-llct-20130819.2tracking-linaro-android-3.11-llct-20130819.1tracking-linaro-android-3.11-llct-20130819.0tracking-linaro-android-3.11-llct-20130812.0tracking-linaro-android-3.11-llct-20130807.0
| -rw-r--r-- | drivers/gpu/ion/ion_chunk_heap.c | 4 | ||||
| -rw-r--r-- | drivers/staging/android/binder_trace.h | 4 | ||||
| -rw-r--r-- | mm/vmscan.c | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/drivers/gpu/ion/ion_chunk_heap.c b/drivers/gpu/ion/ion_chunk_heap.c index d5e7379a6f46..8c8f5c3c5537 100644 --- a/drivers/gpu/ion/ion_chunk_heap.c +++ b/drivers/gpu/ion/ion_chunk_heap.c @@ -185,8 +185,8 @@ struct ion_heap *ion_chunk_heap_create(struct ion_platform_heap *heap_data) chunk_heap->heap.ops = &chunk_heap_ops; chunk_heap->heap.type = ION_HEAP_TYPE_CHUNK; chunk_heap->heap.flags = ION_HEAP_FLAG_DEFER_FREE; - pr_info("%s: base %lu size %u align %ld\n", __func__, chunk_heap->base, - heap_data->size, heap_data->align); + pr_info("%s: base %lu size %zu align %ld\n", __func__, + chunk_heap->base, heap_data->size, heap_data->align); return &chunk_heap->heap; diff --git a/drivers/staging/android/binder_trace.h b/drivers/staging/android/binder_trace.h index 82a567c2af67..c661e376398f 100644 --- a/drivers/staging/android/binder_trace.h +++ b/drivers/staging/android/binder_trace.h @@ -159,7 +159,7 @@ TRACE_EVENT(binder_transaction_node_to_ref, TP_fast_assign( __entry->debug_id = t->debug_id; __entry->node_debug_id = node->debug_id; - __entry->node_ptr = node->ptr; + __entry->node_ptr = (void __user *)node->ptr; __entry->ref_debug_id = ref->debug_id; __entry->ref_desc = ref->desc; ), @@ -184,7 +184,7 @@ TRACE_EVENT(binder_transaction_ref_to_node, __entry->ref_debug_id = ref->debug_id; __entry->ref_desc = ref->desc; __entry->node_debug_id = ref->node->debug_id; - __entry->node_ptr = ref->node->ptr; + __entry->node_ptr = (void __user *)ref->node->ptr; ), TP_printk("transaction=%d node=%d src_ref=%d src_desc=%d ==> dest_ptr=0x%p", __entry->debug_id, __entry->node_debug_id, diff --git a/mm/vmscan.c b/mm/vmscan.c index f5af689ccf8f..f8f5f9079fc7 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -167,7 +167,6 @@ static int debug_shrinker_show(struct seq_file *s, void *unused) down_read(&shrinker_rwsem); list_for_each_entry(shrinker, &shrinker_list, list) { - char name[64]; int num_objs; num_objs = shrinker->shrink(shrinker, &sc); |