From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752236AbdBMMwk (ORCPT ); Mon, 13 Feb 2017 07:52:40 -0500 Received: from mga04.intel.com ([192.55.52.120]:47689 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751765AbdBMMwj (ORCPT ); Mon, 13 Feb 2017 07:52:39 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,156,1484035200"; d="scan'208";a="1094171393" From: "Kirill A. Shutemov" To: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lefaure?= , x86@kernel.org, Borislav Petkov Cc: linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH] x86/vm86: fix unused variable warning if THP is disabled. Date: Mon, 13 Feb 2017 15:52:28 +0300 Message-Id: <20170213125228.63645-1-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170213100352.p2cgpbehza2hloji@pd.tnic> References: <20170213100352.p2cgpbehza2hloji@pd.tnic> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org GCC complaines on unused variable 'vma' in mark_screen_rdonly() if THP is disalbed: 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); ^~~ It shoudln't really. The whole block has to be eliminated as pmd_trans_huge() is 0 if THP is disabled. Anyway, this trick seems make GCC happy. Signed-off-by: Kirill A. Shutemov Reported-by: Jérémy Lefaure --- arch/x86/kernel/vm86_32.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c index ec5d7545e6dc..8cdbd32ededc 100644 --- a/arch/x86/kernel/vm86_32.c +++ b/arch/x86/kernel/vm86_32.c @@ -165,6 +165,7 @@ static void mark_screen_rdonly(struct mm_struct *mm) pmd_t *pmd; pte_t *pte; spinlock_t *ptl; + struct vm_area_struct *vma; int i; down_write(&mm->mmap_sem); @@ -177,7 +178,7 @@ static void mark_screen_rdonly(struct mm_struct *mm) pmd = pmd_offset(pud, 0xA0000); if (pmd_trans_huge(*pmd)) { - struct vm_area_struct *vma = find_vma(mm, 0xA0000); + vma = find_vma(mm, 0xA0000); split_huge_pmd(vma, pmd, 0xA0000); } if (pmd_none_or_clear_bad(pmd)) -- 2.11.0