The inline wrappers: audit_log_kern_module(), audit_tk_injoffset(),
and audit_ntp_log() check audit_dummy_context() without unlikely(),
unlike every other wrapper in the file.

Add the missing annotations for consistency.

Signed-off-by: Ricardo Robaina <rrobaina@redhat.com>
---
 include/linux/audit.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/linux/audit.h b/include/linux/audit.h
index 45abb3722d30..18b44a1c5397 100644
--- a/include/linux/audit.h
+++ b/include/linux/audit.h
@@ -547,7 +547,7 @@ static inline void audit_openat2_how(struct open_how *how)
 
 static inline void audit_log_kern_module(const char *name)
 {
-	if (!audit_dummy_context())
+	if (unlikely(!audit_dummy_context()))
 		__audit_log_kern_module(name);
 }
 
@@ -563,7 +563,7 @@ static inline void audit_tk_injoffset(struct timespec64 offset)
 	if (offset.tv_sec == 0 && offset.tv_nsec == 0)
 		return;
 
-	if (!audit_dummy_context())
+	if (unlikely(!audit_dummy_context()))
 		__audit_tk_injoffset(offset);
 }
 
@@ -586,7 +586,7 @@ static inline void audit_ntp_set_new(struct audit_ntp_data *ad,
 
 static inline void audit_ntp_log(const struct audit_ntp_data *ad)
 {
-	if (!audit_dummy_context())
+	if (unlikely(!audit_dummy_context()))
 		__audit_ntp_log(ad);
 }
 
-- 
2.55.0

On Aug  7, 2026 Ricardo Robaina <rrobaina@redhat.com> wrote:
> 
> The inline wrappers: audit_log_kern_module(), audit_tk_injoffset(),
> and audit_ntp_log() check audit_dummy_context() without unlikely(),
> unlike every other wrapper in the file.
> 
> Add the missing annotations for consistency.
> 
> Signed-off-by: Ricardo Robaina <rrobaina@redhat.com>
> ---
>  include/linux/audit.h | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Thanks.  Merged into audit/dev-staging due to the merge window, this will
move to audit/dev next week.

--
paul-moore.com

On Mon, Aug 24, 2026 at 6:11 PM Paul Moore <paul@paul-moore.com> wrote:
> On Aug  7, 2026 Ricardo Robaina <rrobaina@redhat.com> wrote:
> >
> > The inline wrappers: audit_log_kern_module(), audit_tk_injoffset(),
> > and audit_ntp_log() check audit_dummy_context() without unlikely(),
> > unlike every other wrapper in the file.
> >
> > Add the missing annotations for consistency.
> >
> > Signed-off-by: Ricardo Robaina <rrobaina@redhat.com>
> > ---
> >  include/linux/audit.h | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
>
> Thanks.  Merged into audit/dev-staging due to the merge window, this will
> move to audit/dev next week.

... now in audit/dev, thanks!

-- 
paul-moore.com

Thanks, Paul!

On Mon, Aug 24, 2026 at 7:11 PM Paul Moore <paul@paul-moore.com> wrote:
>
> On Aug  7, 2026 Ricardo Robaina <rrobaina@redhat.com> wrote:
> >
> > The inline wrappers: audit_log_kern_module(), audit_tk_injoffset(),
> > and audit_ntp_log() check audit_dummy_context() without unlikely(),
> > unlike every other wrapper in the file.
> >
> > Add the missing annotations for consistency.
> >
> > Signed-off-by: Ricardo Robaina <rrobaina@redhat.com>
> > ---
> >  include/linux/audit.h | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
>
> Thanks.  Merged into audit/dev-staging due to the merge window, this will
> move to audit/dev next week.
>
> --
> paul-moore.com
>