From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: "Jérémy Lefaure" <jeremy.lefaure@lse.epita.fr>,
x86@kernel.org, "Borislav Petkov" <bp@suse.de>
Cc: linux-kernel@vger.kernel.org,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCH] x86/vm86: fix unused variable warning if THP is disabled.
Date: Mon, 13 Feb 2017 15:52:28 +0300 [thread overview]
Message-ID: <20170213125228.63645-1-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <20170213100352.p2cgpbehza2hloji@pd.tnic>
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 <kirill.shutemov@linux.intel.com>
Reported-by: Jérémy Lefaure <jeremy.lefaure@lse.epita.fr>
---
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
next prev parent reply other threads:[~2017-02-13 12:52 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-08 4:38 [PATCH] x86/vm86: fix compilation warning on a unused variable Jérémy Lefaure
2016-12-08 8:33 ` Borislav Petkov
2016-12-08 17:51 ` Jérémy Lefaure
2016-12-08 10:50 ` Kirill A. Shutemov
2016-12-08 11:44 ` Kirill A. Shutemov
2016-12-08 18:25 ` Jérémy Lefaure
2016-12-12 14:52 ` Kirill A. Shutemov
2016-12-17 4:19 ` Jérémy Lefaure
2017-02-12 14:01 ` Borislav Petkov
2017-02-13 4:20 ` Jérémy Lefaure
2017-02-13 10:03 ` Borislav Petkov
2017-02-13 12:52 ` Kirill A. Shutemov [this message]
2017-02-13 15:49 ` [PATCH] x86/vm86: fix unused variable warning if THP is disabled Thomas Gleixner
2017-02-13 17:47 ` Borislav Petkov
2017-02-13 18:07 ` [tip:x86/urgent] x86/vm86: Fix " tip-bot for Kirill A. Shutemov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170213125228.63645-1-kirill.shutemov@linux.intel.com \
--to=kirill.shutemov@linux.intel.com \
--cc=bp@suse.de \
--cc=jeremy.lefaure@lse.epita.fr \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®