Skip to content

Commit aadfc2f

Browse files
Ingo MolnarKAGA-KOKO
authored andcommitted
entry: Correct 'noinstr' attributes
The noinstr attribute is to be specified before the return type in the same way 'inline' is used. Similar cases were recently fixed for x86 in commit 7f6fa10 ("x86: Correct noinstr qualifiers"), but the generic entry code was based on the the original version and did not carry the fix over. Fixes: a5497ba ("entry: Provide generic interrupt entry/exit code") Signed-off-by: Ingo Molnar <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 935ace2 commit aadfc2f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

kernel/entry/common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs)
256256
exit_to_user_mode();
257257
}
258258

259-
irqentry_state_t noinstr irqentry_enter(struct pt_regs *regs)
259+
noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs)
260260
{
261261
irqentry_state_t ret = {
262262
.exit_rcu = false,
@@ -333,7 +333,7 @@ void irqentry_exit_cond_resched(void)
333333
}
334334
}
335335

336-
void noinstr irqentry_exit(struct pt_regs *regs, irqentry_state_t state)
336+
noinstr void irqentry_exit(struct pt_regs *regs, irqentry_state_t state)
337337
{
338338
lockdep_assert_irqs_disabled();
339339

0 commit comments

Comments
 (0)