From: Sebastian Andrzej Siewior Date: Mon, 25 Jan 2021 19:45:11 +0000 (+0100) Subject: tracing: Remove NULL check from current in tracing_generic_entry_update(). X-Git-Tag: v5.12-rc1~81^2~24 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5817708493bec547914d23dcdd064919ac409f33;p=thirdparty%2Fkernel%2Flinux.git tracing: Remove NULL check from current in tracing_generic_entry_update(). I can't imagine when or why `current' would return a NULL pointer. This check was added in commit 72829bc3d63cd ("ftrace: move enums to ftrace.h and make helper function global") but it doesn't give me hint why it was needed. Assume `current' never returns a NULL pointer and remove the check. Link: https://lkml.kernel.org/r/20210125194511.3924915-5-bigeasy@linutronix.de Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Steven Rostedt (VMware) --- diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index 67ae708de40d6..5d1eeac4bfbea 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -152,10 +152,8 @@ static inline void tracing_generic_entry_update(struct trace_entry *entry, unsigned short type, unsigned int trace_ctx) { - struct task_struct *tsk = current; - entry->preempt_count = trace_ctx & 0xff; - entry->pid = (tsk) ? tsk->pid : 0; + entry->pid = current->pid; entry->type = type; entry->flags = trace_ctx >> 16; }