Received: by 2002:ac0:a591:0:0:0:0:0 with SMTP id m17-v6csp211360imm; Wed, 4 Jul 2018 22:02:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeMpmeiFaFkb8YE+yfBSBApWexzwcIGSyufbRBpAOVI2WnmF0/ncOXSuybvYadK2dZj60t6 X-Received: by 2002:a62:9042:: with SMTP id a63-v6mr4835170pfe.52.1530766931539; Wed, 04 Jul 2018 22:02:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530766931; cv=none; d=google.com; s=arc-20160816; b=XKl7zbbusZod3XsFEIP/opYHdj/VCsldNlwTlL5IbwXyGPM1Wq6bP+p7k50oOuxjTc KGcDDn5tl/oF0PrWEUnYEFn0hlTuZO0Ju7gz1LPd/VdowMr2acLAaYPfI7s+QrXKItAO +l4DM86sZCQrrxolsBlNdmGYk62b5VUSi/C1mTxzCAIN38U2cwldAIDfFyRtEVgyXOxt rQ314VGzeqJAiSpmJPMSlre3yZNhqcQdgfcG7aUyGLvCwlIU9mRRkZCVXLH3+3bwva00 4pjpfOwilv5l5T75KUH032RwBiUUuAEJclFhRTudXFvdKnuWeB/peLcbGN5c/XSmXOOF w3EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=sTB+jgfriGoy0P0MzAdJsREzYQ6JfVW4W3SBErF0BK8=; b=0QSzDIz+Qc5WTd+SbajT10w3tY0RERvV/5SXz+AIld7FZItFOhYWlttSWx1XEsRh8G Szo63R8TSiYH554243DiuH7iLclxE694Ddr7ILLXP4w9edDu3J2FkRYaNByHUx7htgkM oi/y3D/AYI+JRVCxbP9v6GxuEkrVanHADIL3e8fY02AJYojwjtYeGoi0juzjj3Ra0n7O DXFeG/Bw9RQ0QR9KxUe1J2jZQRvrz8J2jhVXSVh6OO0tdCtbG8UUDqNc37v022dJ/9/1 bxrCpUs3+kMK2IIl6LrLKq2d0fJtBfakIix3RNuky43aIp3yEGyin9jYpyDvsqeZAVXK mOtQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d38-v6si4836125pla.422.2018.07.04.22.01.57; Wed, 04 Jul 2018 22:02:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753272AbeGEE73 (ORCPT + 99 others); Thu, 5 Jul 2018 00:59:29 -0400 Received: from relay8-d.mail.gandi.net ([217.70.183.201]:33319 "EHLO relay8-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753225AbeGEE71 (ORCPT ); Thu, 5 Jul 2018 00:59:27 -0400 X-Originating-IP: 79.86.19.127 Received: from alex.numericable.fr (127.19.86.79.rev.sfr.net [79.86.19.127]) (Authenticated sender: alex@ghiti.fr) by relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 1CFF01BF203; Thu, 5 Jul 2018 04:59:19 +0000 (UTC) From: Alexandre Ghiti To: linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, tony.luck@intel.com, fenghua.yu@intel.com, ralf@linux-mips.org, paul.burton@mips.com, jhogan@kernel.org, jejb@parisc-linux.org, deller@gmx.de, benh@kernel.crashing.org, paulus@samba.org, mpe@ellerman.id.au, ysato@users.sourceforge.jp, dalias@libc.org, davem@davemloft.net, tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, arnd@arndb.de, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org, linux-mips@linux-mips.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, linux-arch@vger.kernel.org Cc: Alexandre Ghiti Subject: [PATCH 01/11] hugetlb: Harmonize hugetlb.h arch specific defines with pgtable.h Date: Thu, 5 Jul 2018 04:58:37 +0000 Message-Id: <20180705045847.32575-2-alex@ghiti.fr> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180705045847.32575-1-alex@ghiti.fr> References: <20180705045847.32575-1-alex@ghiti.fr> X-Spam-Level: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org asm-generic/hugetlb.h proposes generic implementations of hugetlb related functions: use __HAVE_ARCH_HUGE* defines in order to make arch specific implementations of hugetlb functions consistent with pgtable.h scheme. Signed-off-by: Alexandre Ghiti --- arch/arm64/include/asm/hugetlb.h | 2 +- include/asm-generic/hugetlb.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/hugetlb.h b/arch/arm64/include/asm/hugetlb.h index e73f68569624..3fcf14663dfa 100644 --- a/arch/arm64/include/asm/hugetlb.h +++ b/arch/arm64/include/asm/hugetlb.h @@ -81,9 +81,9 @@ extern void huge_ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep); extern void huge_ptep_clear_flush(struct vm_area_struct *vma, unsigned long addr, pte_t *ptep); +#define __HAVE_ARCH_HUGE_PTE_CLEAR extern void huge_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep, unsigned long sz); -#define huge_pte_clear huge_pte_clear extern void set_huge_swap_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte, unsigned long sz); #define set_huge_swap_pte_at set_huge_swap_pte_at diff --git a/include/asm-generic/hugetlb.h b/include/asm-generic/hugetlb.h index 9d0cde8ab716..3da7cff52360 100644 --- a/include/asm-generic/hugetlb.h +++ b/include/asm-generic/hugetlb.h @@ -32,7 +32,7 @@ static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot) return pte_modify(pte, newprot); } -#ifndef huge_pte_clear +#ifndef __HAVE_ARCH_HUGE_PTE_CLEAR static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep, unsigned long sz) { -- 2.16.2