Commit eb1b51af authored by Mark Rutland's avatar Mark Rutland Committed by Thomas Gleixner
Browse files

entry: Move irqentry_enter() prototype later 



Subsequent patches will rework the irqentry_*() functions. The end
result (and the intermediate diffs) will be much clearer if the
prototype for the irqentry_enter() function is moved later, immediately
before the prototype of the irqentry_exit() function.

Move the prototype later.

This is purely a move; there should be no functional change as a result
of this change.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@kernel.org>
Reviewed-by: default avatarJinjie Ruan <ruanjinjie@huawei.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20260407131650.3813777-4-mark.rutland@arm.com
parent 22f66e7e

include/linux/irq-entry-common.h

+22 −22
Original line number Diff line number Diff line
@@ -334,6 +334,28 @@ typedef struct irqentry_state { 
} irqentry_state_t;

#endif



/**

 * irqentry_exit_cond_resched - Conditionally reschedule on return from interrupt

 *

 * Conditional reschedule with additional sanity checks.

 */

void raw_irqentry_exit_cond_resched(void);



#ifdef CONFIG_PREEMPT_DYNAMIC

#if defined(CONFIG_HAVE_PREEMPT_DYNAMIC_CALL)

#define irqentry_exit_cond_resched_dynamic_enabled	raw_irqentry_exit_cond_resched

#define irqentry_exit_cond_resched_dynamic_disabled	NULL

DECLARE_STATIC_CALL(irqentry_exit_cond_resched, raw_irqentry_exit_cond_resched);

#define irqentry_exit_cond_resched()	static_call(irqentry_exit_cond_resched)()

#elif defined(CONFIG_HAVE_PREEMPT_DYNAMIC_KEY)

DECLARE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched);

void dynamic_irqentry_exit_cond_resched(void);

#define irqentry_exit_cond_resched()	dynamic_irqentry_exit_cond_resched()

#endif

#else /* CONFIG_PREEMPT_DYNAMIC */

#define irqentry_exit_cond_resched()	raw_irqentry_exit_cond_resched()

#endif /* CONFIG_PREEMPT_DYNAMIC */



/**

 * irqentry_enter - Handle state tracking on ordinary interrupt entries

 * @regs:	Pointer to pt_regs of interrupted context
@@ -367,28 +389,6 @@ typedef struct irqentry_state { 
 */

irqentry_state_t noinstr irqentry_enter(struct pt_regs *regs);



/**

 * irqentry_exit_cond_resched - Conditionally reschedule on return from interrupt

 *

 * Conditional reschedule with additional sanity checks.

 */

void raw_irqentry_exit_cond_resched(void);



#ifdef CONFIG_PREEMPT_DYNAMIC

#if defined(CONFIG_HAVE_PREEMPT_DYNAMIC_CALL)

#define irqentry_exit_cond_resched_dynamic_enabled	raw_irqentry_exit_cond_resched

#define irqentry_exit_cond_resched_dynamic_disabled	NULL

DECLARE_STATIC_CALL(irqentry_exit_cond_resched, raw_irqentry_exit_cond_resched);

#define irqentry_exit_cond_resched()	static_call(irqentry_exit_cond_resched)()

#elif defined(CONFIG_HAVE_PREEMPT_DYNAMIC_KEY)

DECLARE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched);

void dynamic_irqentry_exit_cond_resched(void);

#define irqentry_exit_cond_resched()	dynamic_irqentry_exit_cond_resched()

#endif

#else /* CONFIG_PREEMPT_DYNAMIC */

#define irqentry_exit_cond_resched()	raw_irqentry_exit_cond_resched()

#endif /* CONFIG_PREEMPT_DYNAMIC */



/**

 * irqentry_exit - Handle return from exception that used irqentry_enter()

 * @regs:	Pointer to pt_regs (exception entry regs)