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

Commit fec1a13b authored by Sasha Levin's avatar Sasha Levin Committed by Greg Kroah-Hartman
Browse files

Revert "x86/uaccess, ftrace: Fix ftrace_likely_update() vs. SMAP" 



This reverts commit 1a3188d7, which was
upstream commit 4a6c91fbdef846ec7250b82f2eeeb87ac5f18cf9.

On Tue, Jun 25, 2019 at 09:39:45AM +0200, Sebastian Andrzej Siewior wrote:
>Please backport commit e74deb11931ff682b59d5b9d387f7115f689698e to
>stable _or_ revert the backport of commit 4a6c91fbdef84 ("x86/uaccess,
>ftrace: Fix ftrace_likely_update() vs. SMAP"). It uses
>user_access_{save|restore}() which has been introduced in the following
>commit.

Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 85a3b1ef

kernel/trace/trace_branch.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -205,8 +205,6 @@ void trace_likely_condition(struct ftrace_likely_data *f, int val, int expect) 
void ftrace_likely_update(struct ftrace_likely_data *f, int val,

void ftrace_likely_update(struct ftrace_likely_data *f, int val,

			  int expect, int is_constant)

			  int expect, int is_constant)

{

{

	unsigned long flags = user_access_save();



	/* A constant is always correct */

	/* A constant is always correct */

	if (is_constant) {

	if (is_constant) {

		f->constant++;

		f->constant++;
@@ -225,8 +223,6 @@ void ftrace_likely_update(struct ftrace_likely_data *f, int val, 
		f->data.correct++;

		f->data.correct++;

	else

	else

		f->data.incorrect++;

		f->data.incorrect++;



	user_access_restore(flags);

}

}

EXPORT_SYMBOL(ftrace_likely_update);

EXPORT_SYMBOL(ftrace_likely_update);