tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Reviewed-by: Jinjie Ruan <ruanjinjie@huawei.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://patch.msgid.link/20260407131650.3813777-4-mark.rutland@arm.com

authored by

Mark Rutland and committed by
Thomas Gleixner eb1b51af 22f66e7e

+22 -22
+22 -22
include/linux/irq-entry-common.h
··· 335 335 #endif 336 336 337 337 /** 338 + * irqentry_exit_cond_resched - Conditionally reschedule on return from interrupt 339 + * 340 + * Conditional reschedule with additional sanity checks. 341 + */ 342 + void raw_irqentry_exit_cond_resched(void); 343 + 344 + #ifdef CONFIG_PREEMPT_DYNAMIC 345 + #if defined(CONFIG_HAVE_PREEMPT_DYNAMIC_CALL) 346 + #define irqentry_exit_cond_resched_dynamic_enabled raw_irqentry_exit_cond_resched 347 + #define irqentry_exit_cond_resched_dynamic_disabled NULL 348 + DECLARE_STATIC_CALL(irqentry_exit_cond_resched, raw_irqentry_exit_cond_resched); 349 + #define irqentry_exit_cond_resched() static_call(irqentry_exit_cond_resched)() 350 + #elif defined(CONFIG_HAVE_PREEMPT_DYNAMIC_KEY) 351 + DECLARE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched); 352 + void dynamic_irqentry_exit_cond_resched(void); 353 + #define irqentry_exit_cond_resched() dynamic_irqentry_exit_cond_resched() 354 + #endif 355 + #else /* CONFIG_PREEMPT_DYNAMIC */ 356 + #define irqentry_exit_cond_resched() raw_irqentry_exit_cond_resched() 357 + #endif /* CONFIG_PREEMPT_DYNAMIC */ 358 + 359 + /** 338 360 * irqentry_enter - Handle state tracking on ordinary interrupt entries 339 361 * @regs: Pointer to pt_regs of interrupted context 340 362 * ··· 388 366 * Returns: An opaque object that must be passed to irqentry_exit() 389 367 */ 390 368 irqentry_state_t noinstr irqentry_enter(struct pt_regs *regs); 391 - 392 - /** 393 - * irqentry_exit_cond_resched - Conditionally reschedule on return from interrupt 394 - * 395 - * Conditional reschedule with additional sanity checks. 396 - */ 397 - void raw_irqentry_exit_cond_resched(void); 398 - 399 - #ifdef CONFIG_PREEMPT_DYNAMIC 400 - #if defined(CONFIG_HAVE_PREEMPT_DYNAMIC_CALL) 401 - #define irqentry_exit_cond_resched_dynamic_enabled raw_irqentry_exit_cond_resched 402 - #define irqentry_exit_cond_resched_dynamic_disabled NULL 403 - DECLARE_STATIC_CALL(irqentry_exit_cond_resched, raw_irqentry_exit_cond_resched); 404 - #define irqentry_exit_cond_resched() static_call(irqentry_exit_cond_resched)() 405 - #elif defined(CONFIG_HAVE_PREEMPT_DYNAMIC_KEY) 406 - DECLARE_STATIC_KEY_TRUE(sk_dynamic_irqentry_exit_cond_resched); 407 - void dynamic_irqentry_exit_cond_resched(void); 408 - #define irqentry_exit_cond_resched() dynamic_irqentry_exit_cond_resched() 409 - #endif 410 - #else /* CONFIG_PREEMPT_DYNAMIC */ 411 - #define irqentry_exit_cond_resched() raw_irqentry_exit_cond_resched() 412 - #endif /* CONFIG_PREEMPT_DYNAMIC */ 413 369 414 370 /** 415 371 * irqentry_exit - Handle return from exception that used irqentry_enter()