From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751969Ab2KPJyO (ORCPT ); Fri, 16 Nov 2012 04:54:14 -0500 Received: from mga14.intel.com ([143.182.124.37]:16838 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751629Ab2KPJyM (ORCPT ); Fri, 16 Nov 2012 04:54:12 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.83,263,1352102400"; d="scan'208";a="169124344" From: "Kirill A. Shutemov" To: Andrew Morton Cc: linux-mm@kvack.org, "Kirill A. Shutemov" , Xiao Guangrong , Ingo Molnar , Andrea Arcangeli , Peter Zijlstra , linux-kernel@vger.kernel.org Subject: [PATCH 1/2] thp: fix update_mmu_cache_pmd() calls Date: Fri, 16 Nov 2012 11:55:15 +0200 Message-Id: <1353059717-9850-1-git-send-email-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 1.7.10.4 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Kirill A. Shutemov" update_mmu_cache_pmd() takes pointer to pmd_t as third, not pmd_t. mm/huge_memory.c: In function 'do_huge_pmd_numa_page': mm/huge_memory.c:825:2: error: incompatible type for argument 3 of 'update_mmu_cache_pmd' In file included from include/linux/mm.h:44:0, from mm/huge_memory.c:8: arch/mips/include/asm/pgtable.h:385:20: note: expected 'struct pmd_t *' but argument is of type 'pmd_t' mm/huge_memory.c:895:2: error: incompatible type for argument 3 of 'update_mmu_cache_pmd' In file included from include/linux/mm.h:44:0, from mm/huge_memory.c:8: arch/mips/include/asm/pgtable.h:385:20: note: expected 'struct pmd_t *' but argument is of type 'pmd_t' Signed-off-by: Kirill A. Shutemov --- mm/huge_memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 4489e16..2401a16 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -886,7 +886,7 @@ fixup: /* change back to regular protection */ entry = pmd_modify(entry, vma->vm_page_prot); set_pmd_at(mm, haddr, pmd, entry); - update_mmu_cache_pmd(vma, address, entry); + update_mmu_cache_pmd(vma, address, &entry); unlock: spin_unlock(&mm->page_table_lock); @@ -956,7 +956,7 @@ migrate: page_add_new_anon_rmap(new_page, vma, haddr); set_pmd_at(mm, haddr, pmd, entry); - update_mmu_cache_pmd(vma, address, entry); + update_mmu_cache_pmd(vma, address, &entry); page_remove_rmap(page); spin_unlock(&mm->page_table_lock); -- 1.7.11.7