summaryrefslogtreecommitdiff
path: root/drivers/android
diff options
context:
space:
mode:
authorMohamad Alsadhan <mo@sdhn.cc>2026-03-17 17:49:42 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2026-04-01 12:18:22 +0200
commite3007a92332d15b085c5d1157ffeea26f03f0aa6 (patch)
tree168b4a680653485fbab7cf49669b0d6cd3b81c0b /drivers/android
parentf698a253e3936ed516aa234495861eb707d608b9 (diff)
rust_binder: remove "rust_" prefix from tracepoints
Remove the "rust_" prefix as the name is part of the uapi, and userspace expects tracepoints to have the old names. Link: https://github.com/Rust-for-Linux/linux/issues/1226 Suggested-by: Alice Ryhl <aliceryhl@google.com> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Signed-off-by: Mohamad Alsadhan <mo@sdhn.cc> Link: https://patch.msgid.link/20260317-rust-binder-trace-v3-1-6fae4fbcf637@sdhn.cc Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/android')
-rw-r--r--drivers/android/binder/rust_binder_events.h4
-rw-r--r--drivers/android/binder/trace.rs8
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/android/binder/rust_binder_events.h b/drivers/android/binder/rust_binder_events.h
index 8ad785c6bd0f..e3adfb93170d 100644
--- a/drivers/android/binder/rust_binder_events.h
+++ b/drivers/android/binder/rust_binder_events.h
@@ -15,7 +15,7 @@
#include <linux/tracepoint.h>
-TRACE_EVENT(rust_binder_ioctl,
+TRACE_EVENT(binder_ioctl,
TP_PROTO(unsigned int cmd, unsigned long arg),
TP_ARGS(cmd, arg),
@@ -30,7 +30,7 @@ TRACE_EVENT(rust_binder_ioctl,
TP_printk("cmd=0x%x arg=0x%lx", __entry->cmd, __entry->arg)
);
-TRACE_EVENT(rust_binder_transaction,
+TRACE_EVENT(binder_transaction,
TP_PROTO(bool reply, rust_binder_transaction t, struct task_struct *thread),
TP_ARGS(reply, t, thread),
TP_STRUCT__entry(
diff --git a/drivers/android/binder/trace.rs b/drivers/android/binder/trace.rs
index 9839901c7151..d54b18ab71a8 100644
--- a/drivers/android/binder/trace.rs
+++ b/drivers/android/binder/trace.rs
@@ -10,8 +10,8 @@ use kernel::task::Task;
use kernel::tracepoint::declare_trace;
declare_trace! {
- unsafe fn rust_binder_ioctl(cmd: c_uint, arg: c_ulong);
- unsafe fn rust_binder_transaction(reply: bool, t: rust_binder_transaction, thread: *mut task_struct);
+ unsafe fn binder_ioctl(cmd: c_uint, arg: c_ulong);
+ unsafe fn binder_transaction(reply: bool, t: rust_binder_transaction, thread: *mut task_struct);
}
#[inline]
@@ -22,7 +22,7 @@ fn raw_transaction(t: &Transaction) -> rust_binder_transaction {
#[inline]
pub(crate) fn trace_ioctl(cmd: u32, arg: usize) {
// SAFETY: Always safe to call.
- unsafe { rust_binder_ioctl(cmd, arg as c_ulong) }
+ unsafe { binder_ioctl(cmd, arg as c_ulong) }
}
#[inline]
@@ -33,5 +33,5 @@ pub(crate) fn trace_transaction(reply: bool, t: &Transaction, thread: Option<&Ta
};
// SAFETY: The raw transaction is valid for the duration of this call. The thread pointer is
// valid or null.
- unsafe { rust_binder_transaction(reply, raw_transaction(t), thread) }
+ unsafe { binder_transaction(reply, raw_transaction(t), thread) }
}