diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-28 09:45:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-28 09:45:00 +0200 |
| commit | 4f822ad5ee944ffafc21937a32dd055f1df5c28d (patch) | |
| tree | 9b38a39de453ec1694fb383a812639162d1182a0 /drivers/android/binder.c | |
| parent | rpmsg: qcom_smd: Fix uninitialized return variable in __qcom_smd_send() (diff) | |
| parent | Linux 6.15-rc4 (diff) | |
| download | linux-rng-4f822ad5ee944ffafc21937a32dd055f1df5c28d.tar.xz linux-rng-4f822ad5ee944ffafc21937a32dd055f1df5c28d.zip | |
Merge 6.15-rc4 into char-misc-next
We need the char-misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 9f215391ac7a..91adf18675a1 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -6368,7 +6368,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, |