Commit d25c8be6 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'core/entry' into x86/entry 



Pick up generic entry code fixes.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 72c3c0fe 3135f5b7

include/linux/seccomp.h

+2 −1
Original line number Diff line number Diff line
@@ -58,10 +58,11 @@ static inline int seccomp_mode(struct seccomp *s) 


struct seccomp { };

struct seccomp_filter { };

struct seccomp_data;



#ifdef CONFIG_HAVE_ARCH_SECCOMP_FILTER

static inline int secure_computing(void) { return 0; }

static inline int __secure_computing(void) { return 0; }

static inline int __secure_computing(const struct seccomp_data *sd) { return 0; }

#else

static inline void secure_computing_strict(int this_syscall) { return; }

#endif

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();