Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp271401yba; Thu, 25 Apr 2019 23:03:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqzOx36Sqh/L3DXrXMB8UVCq1v4MvSaXx9hQn3mJ9zsPTwP/64eGW6p3WlHfk2OPzAJysxoG X-Received: by 2002:a17:902:a5ca:: with SMTP id t10mr44398032plq.234.1556258589019; Thu, 25 Apr 2019 23:03:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556258589; cv=none; d=google.com; s=arc-20160816; b=tnXAVr39YJGIHfdNtnYn4Olbb5wzz7d1VPkyOPxSu1DMZPbKGLALL29hXnaPcJJOv9 uE9uw3b9+v1Yiu1qBXCqWCPm41iSJF9qvIeG/eBJ/KDAzK5Hqd3EgZjajRJUysQoPPSX RJsLizKgiO1gLfcY/wAFYx8EAGWQ84RbdNHOSHL8opALtiCnaPGjLx7JV/8TP3K3xVO2 yFYaVzkhmcGE1CSSuN1iBoQmDEC95gr0KuMNad+TT4lyyFfVKjbMluPBqoYeYMu+nxLz x2gk73udmtiPlj9Q9Ew6OCo0dBqrnXQue9st1pJZ+RErnxdYWE8+ipaziEZdQW83deQ0 dBEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=4kEDLZNkBNAYCQ5OcoGO2PuBDx1/QI5nsGEmUjCJNzw=; b=AbLpoO/hdRsu8LZp8ufZ1rHuAWuLnxbOuW90Ub5m9hf5tXnPRio3H6O8y/rFKk60eu Rv3nUaXB8Ux3M1HHw/vOWUq0lMJZ9TmkGx6LXyATO0nO8qATyuiK+47rr8aR01QZChGh gITc2UJTU5c+Tz94I7aQNmjgt8RAbvlCXutjznh6x+Tb0XFQrhJ1F0Fu1gUZKTeU35us OrgOVlYObaGouIOaqosHBGUykjqHQ3GMHxIbQzuI6GZiI7R3ypQHCKuAwsXQho01rEmG 0jvAXqLjhfoKVF3jJuKGMDWIwM5V+kFkKCI1D4k5I7iBX6Dj86vHclqnQj+GReo82b0C yasw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=DVuXMago; 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 h1si13800644pgk.39.2019.04.25.23.02.53; Thu, 25 Apr 2019 23:03:09 -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; dkim=pass header.i=@c-s.fr header.s=mail header.b=DVuXMago; 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 S1727295AbfDZGAL (ORCPT + 99 others); Fri, 26 Apr 2019 02:00:11 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:60344 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727020AbfDZF7v (ORCPT ); Fri, 26 Apr 2019 01:59:51 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 44r3Kv2Tq7z9v1vP; Fri, 26 Apr 2019 07:59:47 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=DVuXMago; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id 3dBihyuc_5WN; Fri, 26 Apr 2019 07:59:47 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 44r3Kv1TYdz9v1tj; Fri, 26 Apr 2019 07:59:47 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1556258387; bh=4kEDLZNkBNAYCQ5OcoGO2PuBDx1/QI5nsGEmUjCJNzw=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=DVuXMagoAbuIWEZZwTVKXG0tADE8VQ6UXfN3DKe7buTgDOsVa/1q/pFswEdag6l50 8iW1iTmS5hlqHdjdbcu4CjwKQCZRKos6LJ1I6JlZ6TCI+OueKSyCmY44BmqIEqps76 jOXZWwWupVwRDaoeMRz/j7chAgrU1fSHth4Jmeuk= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 1962C8B807; Fri, 26 Apr 2019 07:59:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id AQkN-zkAJyC0; Fri, 26 Apr 2019 07:59:48 +0200 (CEST) Received: from po16846vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.6]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 01C618B74C; Fri, 26 Apr 2019 07:59:48 +0200 (CEST) Received: by po16846vm.idsi0.si.c-s.fr (Postfix, from userid 0) id D962166276; Fri, 26 Apr 2019 05:59:47 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 12/17] powerpc/mm: move hugetlb_disabled into asm/hugetlb.h To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , aneesh.kumar@linux.ibm.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 26 Apr 2019 05:59:47 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No need to have this in asm/page.h, move it into asm/hugetlb.h Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/hugetlb.h | 2 ++ arch/powerpc/include/asm/page.h | 1 - arch/powerpc/kernel/fadump.c | 1 + arch/powerpc/mm/hash_utils_64.c | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/hugetlb.h b/arch/powerpc/include/asm/hugetlb.h index fd5c0873a57d..84598c6b0959 100644 --- a/arch/powerpc/include/asm/hugetlb.h +++ b/arch/powerpc/include/asm/hugetlb.h @@ -13,6 +13,8 @@ #include #endif /* CONFIG_PPC_BOOK3S_64 */ +extern bool hugetlb_disabled; + void flush_dcache_icache_hugepage(struct page *page); int slice_is_hugepage_only_range(struct mm_struct *mm, unsigned long addr, diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index 748f5db2e2b7..6b508420d92b 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -29,7 +29,6 @@ #ifndef __ASSEMBLY__ #ifdef CONFIG_HUGETLB_PAGE -extern bool hugetlb_disabled; extern unsigned int HPAGE_SHIFT; #else #define HPAGE_SHIFT PAGE_SHIFT diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index 45a8d0be1c96..25f063f56ec5 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index f727197de713..db1aef2adc88 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -37,6 +37,7 @@ #include #include #include +#include #include #include -- 2.13.3