From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752063AbdBMGGj (ORCPT ); Mon, 13 Feb 2017 01:06:39 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:35768 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751889AbdBMGGi (ORCPT ); Mon, 13 Feb 2017 01:06:38 -0500 From: Seunghun Han To: akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, Seunghun Han Subject: [PATCH] x86: kernel: fix unused variable warning in vm86_32.c Date: Mon, 13 Feb 2017 15:05:11 +0900 Message-Id: <1486965911-54419-1-git-send-email-kkamagui@gmail.com> X-Mailer: git-send-email 2.1.4 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 If CONFIG_TRANSPARENT_HUGEPAGE is not set in kernel config, a warning is shown in vm86_32.c. The warning is as follows: >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); The vma variable is used to call split_huge_pmd() macro function, but split_huge_pmd() is defined as a null macro when CONFIG_TRANSPARENT_HUGEPAGE is not set in kernel config. Therefore, the compiler shows an unused variable warning. To remove this warning, I change the split_huge_pmd() macro function to static inline function and static inline null function. Inline function works like a macro function, therefore there is no impact on Linux kernel working. Signed-off-by: Seunghun Han --- include/linux/huge_mm.h | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index a3762d4..912a763 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -123,15 +123,12 @@ void deferred_split_huge_page(struct page *page); void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, unsigned long address, bool freeze, struct page *page); -#define split_huge_pmd(__vma, __pmd, __address) \ - do { \ - pmd_t *____pmd = (__pmd); \ - if (pmd_trans_huge(*____pmd) \ - || pmd_devmap(*____pmd)) \ - __split_huge_pmd(__vma, __pmd, __address, \ - false, NULL); \ - } while (0) - +static inline void split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, + unsigned long address) +{ + if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) + __split_huge_pmd(vma, pmd, address, false, NULL); +} void split_huge_pmd_address(struct vm_area_struct *vma, unsigned long address, bool freeze, struct page *page); @@ -241,9 +238,8 @@ static inline int split_huge_page(struct page *page) return 0; } static inline void deferred_split_huge_page(struct page *page) {} -#define split_huge_pmd(__vma, __pmd, __address) \ - do { } while (0) - +static inline void split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, + unsigned long address) {} static inline void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, unsigned long address, bool freeze, struct page *page) {} static inline void split_huge_pmd_address(struct vm_area_struct *vma, -- 2.1.4