signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus
authorEric W. Biederman <ebiederm@xmission.com>
Mon, 3 Jun 2019 15:23:58 +0000 (10:23 -0500)
committerEric W. Biederman <ebiederm@xmission.com>
Mon, 3 Jun 2019 15:23:58 +0000 (10:23 -0500)
commit318759b4737c3b3789e2fd64d539f437d52386f5
tree80b6b478a49501eb8923a747159288eef8b79d97
parenta89e9b8abf82725e4ac96100e07c8104dbe8a240
signal/x86: Move tsk inside of CONFIG_MEMORY_FAILURE in do_sigbus

Stephen Rothwell <sfr@canb.auug.org.au> reported:
> After merging the userns tree, today's linux-next build (i386 defconfig)
> produced this warning:
>
> arch/x86/mm/fault.c: In function 'do_sigbus':
> arch/x86/mm/fault.c:1017:22: warning: unused variable 'tsk' [-Wunused-variable]
>   struct task_struct *tsk = current;
>                       ^~~
>
> Introduced by commit
>
>   351b6825b3a9 ("signal: Explicitly call force_sig_fault on current")
>
> The remaining used of "tsk" are protected by CONFIG_MEMORY_FAILURE.

So do the obvious thing and move tsk inside of CONFIG_MEMORY_FAILURE
to prevent introducing new warnings into the build.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
arch/x86/mm/fault.c