OSDN Git Service

x86/vm86: Fix unused variable warning if THP is disabled
authorKirill A. Shutemov <kirill.shutemov@linux.intel.com>
Mon, 13 Feb 2017 12:52:28 +0000 (15:52 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 25 Feb 2018 10:05:53 +0000 (11:05 +0100)
commit6215c811b3a8a5fef320588ac0193ea70574c8e6
treeafae24459d42b93f69a70966ea3d6a2bc04f46c6
parentbb70b2a03c7c150b292ba2ba83afd31481b11fd6
x86/vm86: Fix unused variable warning if THP is disabled

commit 3ba5b5ea7dc3a10ef50819b43a9f8de2705f4eec upstream.

GCC complains about unused variable 'vma' in mark_screen_rdonly() if THP is
disabled:

arch/x86/kernel/vm86_32.c: In function ‘mark_screen_rdonly’:
arch/x86/kernel/vm86_32.c:180:26: warning: unused variable ‘vma’
[-Wunused-variable]
   struct vm_area_struct *vma = find_vma(mm, 0xA0000);

That's silly. pmd_trans_huge() resolves to 0 when THP is disabled, so the
whole block should be eliminated.

Moving the variable declaration outside the if() block shuts GCC up.

Reported-by: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Tested-by: Borislav Petkov <bp@suse.de>
Cc: Carlos O'Donell <carlos@redhat.com>
Link: http://lkml.kernel.org/r/20170213125228.63645-1-kirill.shutemov@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kernel/vm86_32.c