Commit 54e82e93 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents aacb0a6d 4a824c31

include/linux/irq-entry-common.h

+2 −2
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ static __always_inline void enter_from_user_mode(struct pt_regs *regs) 
static inline void local_irq_enable_exit_to_user(unsigned long ti_work);



#ifndef local_irq_enable_exit_to_user

static inline void local_irq_enable_exit_to_user(unsigned long ti_work)

static __always_inline void local_irq_enable_exit_to_user(unsigned long ti_work)

{

	local_irq_enable();

}
@@ -125,7 +125,7 @@ static inline void local_irq_enable_exit_to_user(unsigned long ti_work) 
static inline void local_irq_disable_exit_to_user(void);



#ifndef local_irq_disable_exit_to_user

static inline void local_irq_disable_exit_to_user(void)

static __always_inline void local_irq_disable_exit_to_user(void)

{

	local_irq_disable();

}