Skip to content

Commit 54e82e9

Browse files
committed
Merge tag 'core_urgent_for_v6.19_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core entry fix from Borislav Petkov: - Make sure clang inlines trivial local_irq_* helpers * tag 'core_urgent_for_v6.19_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: entry: Always inline local_irq_{enable,disable}_exit_to_user()
2 parents aacb0a6 + 4a824c3 commit 54e82e9

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

include/linux/irq-entry-common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ static __always_inline void enter_from_user_mode(struct pt_regs *regs)
110110
static inline void local_irq_enable_exit_to_user(unsigned long ti_work);
111111

112112
#ifndef local_irq_enable_exit_to_user
113-
static inline void local_irq_enable_exit_to_user(unsigned long ti_work)
113+
static __always_inline void local_irq_enable_exit_to_user(unsigned long ti_work)
114114
{
115115
local_irq_enable();
116116
}
@@ -125,7 +125,7 @@ static inline void local_irq_enable_exit_to_user(unsigned long ti_work)
125125
static inline void local_irq_disable_exit_to_user(void);
126126

127127
#ifndef local_irq_disable_exit_to_user
128-
static inline void local_irq_disable_exit_to_user(void)
128+
static __always_inline void local_irq_disable_exit_to_user(void)
129129
{
130130
local_irq_disable();
131131
}

0 commit comments

Comments
 (0)