Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a42c6ded authored by Al Viro's avatar Al Viro
Browse files

move key_repace_session_keyring() into tracehook_notify_resume() 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1227dd77

arch/alpha/kernel/signal.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -590,7 +590,5 @@ do_notify_resume(struct pt_regs *regs, struct switch_stack *sw, 
	if (thread_info_flags & _TIF_NOTIFY_RESUME) {

	if (thread_info_flags & _TIF_NOTIFY_RESUME) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

		clear_thread_flag(TIF_NOTIFY_RESUME);

		tracehook_notify_resume(regs);

		tracehook_notify_resume(regs);

		if (current->replacement_session_keyring)

			key_replace_session_keyring();

	}

	}

}
 
}

arch/arm/kernel/signal.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -728,7 +728,5 @@ do_notify_resume(struct pt_regs *regs, unsigned int thread_flags, int syscall) 
	if (thread_flags & _TIF_NOTIFY_RESUME) {

	if (thread_flags & _TIF_NOTIFY_RESUME) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

		clear_thread_flag(TIF_NOTIFY_RESUME);

		tracehook_notify_resume(regs);

		tracehook_notify_resume(regs);

		if (current->replacement_session_keyring)

			key_replace_session_keyring();

	}

	}

}
 
}

arch/avr32/kernel/signal.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -321,7 +321,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, struct thread_info *ti) 
	if (ti->flags & _TIF_NOTIFY_RESUME) {

	if (ti->flags & _TIF_NOTIFY_RESUME) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

		clear_thread_flag(TIF_NOTIFY_RESUME);

		tracehook_notify_resume(regs);

		tracehook_notify_resume(regs);

		if (current->replacement_session_keyring)

			key_replace_session_keyring();

	}

	}

}
 
}

arch/blackfin/kernel/signal.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -336,8 +336,6 @@ asmlinkage void do_notify_resume(struct pt_regs *regs) 
	if (test_thread_flag(TIF_NOTIFY_RESUME)) {

	if (test_thread_flag(TIF_NOTIFY_RESUME)) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

		clear_thread_flag(TIF_NOTIFY_RESUME);

		tracehook_notify_resume(regs);

		tracehook_notify_resume(regs);

		if (current->replacement_session_keyring)

			key_replace_session_keyring();

	}

	}

}

}

arch/c6x/kernel/signal.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -364,7 +364,5 @@ asmlinkage void do_notify_resume(struct pt_regs *regs, u32 thread_info_flags, 
	if (thread_info_flags & (1 << TIF_NOTIFY_RESUME)) {

	if (thread_info_flags & (1 << TIF_NOTIFY_RESUME)) {

		clear_thread_flag(TIF_NOTIFY_RESUME);

		clear_thread_flag(TIF_NOTIFY_RESUME);

		tracehook_notify_resume(regs);

		tracehook_notify_resume(regs);

		if (current->replacement_session_keyring)

			key_replace_session_keyring();

	}

	}

}
 
}