diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2025-05-15 16:20:39 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2025-05-15 16:20:39 -0700 |
| commit | d51b9d81f7883f526b26e3ab903e646274aebeb1 (patch) | |
| tree | 9027f2e9b9f7529eda9220c4bcb38e4541c81646 /drivers/android/binder.c | |
| parent | 74d3da135f69a910df0f3487bebd3de540450d4a (diff) | |
| parent | 82f2b0b97b36ee3fcddf0f0780a9a0825d52fec3 (diff) | |
| download | linux-next-d51b9d81f7883f526b26e3ab903e646274aebeb1.tar.gz linux-next-d51b9d81f7883f526b26e3ab903e646274aebeb1.zip | |
Merge tag 'v6.15-rc6' into next
Sync up with mainline to bring in xpad controller changes.
Diffstat (limited to 'drivers/android/binder.c')
| -rw-r--r-- | drivers/android/binder.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 76052006bd87..5fc2c8ee61b1 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -6373,7 +6373,7 @@ static void print_binder_transaction_ilocked(struct seq_file *m, seq_printf(m, " node %d", buffer->target_node->debug_id); seq_printf(m, " size %zd:%zd offset %lx\n", buffer->data_size, buffer->offsets_size, - proc->alloc.vm_start - buffer->user_data); + buffer->user_data - proc->alloc.vm_start); } static void print_binder_work_ilocked(struct seq_file *m, |