Commit aadfc2f9 authored by Ingo Molnar's avatar Ingo Molnar Committed by Thomas Gleixner
Browse files

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 7f6fa101 ("x86:
Correct noinstr qualifiers"), but the generic entry code was based on the
the original version and did not carry the fix over.

Fixes: a5497bab ("entry: Provide generic interrupt entry/exit code")
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lkml.kernel.org/r/20200725091951.744848-3-mingo@kernel.org
parent 935ace2f

kernel/entry/common.c

+2 −2
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ noinstr void irqentry_exit_to_user_mode(struct pt_regs *regs) 
	exit_to_user_mode();

}



irqentry_state_t noinstr irqentry_enter(struct pt_regs *regs)

noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs)

{

	irqentry_state_t ret = {

		.exit_rcu = false,
@@ -333,7 +333,7 @@ void irqentry_exit_cond_resched(void) 
	}

}



void noinstr irqentry_exit(struct pt_regs *regs, irqentry_state_t state)

noinstr void irqentry_exit(struct pt_regs *regs, irqentry_state_t state)

{

	lockdep_assert_irqs_disabled();