From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753079AbbCYJOu (ORCPT ); Wed, 25 Mar 2015 05:14:50 -0400 Received: from ozlabs.org ([103.22.144.67]:58453 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752858AbbCYJME (ORCPT ); Wed, 25 Mar 2015 05:12:04 -0400 From: Michael Ellerman To: Cc: , aneesh.kumar@in.ibm.com, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, aarcange@redhat.com, borntraeger@de.ibm.com, steve.capper@linaro.org, linux-mm@kvack.org Subject: [PATCH 5/6] mm/gup: Replace ACCESS_ONCE with READ_ONCE for STRICT_MM_TYPECHECKS Date: Wed, 25 Mar 2015 20:11:58 +1100 Message-Id: <1427274719-25890-5-git-send-email-mpe@ellerman.id.au> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1427274719-25890-1-git-send-email-mpe@ellerman.id.au> References: <1427274719-25890-1-git-send-email-mpe@ellerman.id.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If STRICT_MM_TYPECHECKS is enabled the generic gup code fails to build because we are using ACCESS_ONCE on non-scalar types. Convert all uses to READ_ONCE. Cc: akpm@linux-foundation.org Cc: kirill.shutemov@linux.intel.com Cc: aarcange@redhat.com Cc: borntraeger@de.ibm.com Cc: steve.capper@linaro.org Cc: linux-mm@kvack.org Signed-off-by: Michael Ellerman --- mm/gup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/gup.c b/mm/gup.c index a6e24e246f86..120c3adc843c 100644 --- a/mm/gup.c +++ b/mm/gup.c @@ -901,7 +901,7 @@ static int gup_pte_range(pmd_t pmd, unsigned long addr, unsigned long end, * * for an example see gup_get_pte in arch/x86/mm/gup.c */ - pte_t pte = ACCESS_ONCE(*ptep); + pte_t pte = READ_ONCE(*ptep); struct page *page; /* @@ -1191,7 +1191,7 @@ int __get_user_pages_fast(unsigned long start, int nr_pages, int write, local_irq_save(flags); pgdp = pgd_offset(mm, addr); do { - pgd_t pgd = ACCESS_ONCE(*pgdp); + pgd_t pgd = READ_ONCE(*pgdp); next = pgd_addr_end(addr, end); if (pgd_none(pgd)) -- 2.1.0