diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2020-07-26 18:15:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-07-26 18:25:24 +0200 |
| commit | d25c8be67481aaaa060782d7e8b84bc0d0355922 (patch) | |
| tree | a2623611d4de40abdef02853225c90de7356cf04 /kernel/entry/common.c | |
| parent | x86/kvm: Use generic xfer to guest work function (diff) | |
| parent | entry: Correct __secure_computing() stub (diff) | |
| download | wireguard-linux-d25c8be67481aaaa060782d7e8b84bc0d0355922.tar.xz wireguard-linux-d25c8be67481aaaa060782d7e8b84bc0d0355922.zip | |
Merge branch 'core/entry' into x86/entry
Pick up generic entry code fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/entry/common.c')
| -rw-r--r-- | kernel/entry/common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/entry/common.c b/kernel/entry/common.c index 495f5c051b03..9852e0d62d95 100644 --- a/kernel/entry/common.c +++ b/kernel/entry/common.c @@ -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(); |