From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759530AbbIVTnx (ORCPT ); Tue, 22 Sep 2015 15:43:53 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54559 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759231AbbIVTnu (ORCPT ); Tue, 22 Sep 2015 15:43:50 -0400 Date: Tue, 22 Sep 2015 12:42:54 -0700 From: tip-bot for Toshi Kani Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, elliott@hpe.com, linux-kernel@vger.kernel.org, bp@alien8.de, konrad.wilk@oracle.com, mingo@redhat.com, toshi.kani@hpe.com, jgross@suse.com, mingo@kernel.org, akpm@linux-foundation.org Reply-To: mingo@kernel.org, akpm@linux-foundation.org, jgross@suse.com, mingo@redhat.com, toshi.kani@hpe.com, konrad.wilk@oracle.com, bp@alien8.de, elliott@hpe.com, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de In-Reply-To: <1442514264-12475-3-git-send-email-toshi.kani@hpe.com> References: <1442514264-12475-3-git-send-email-toshi.kani@hpe.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/mm] x86/asm: Move PUD_PAGE macros to page_types.h Git-Commit-ID: 832102671855f73962e7a04fdafd48b9385ea5c6 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 832102671855f73962e7a04fdafd48b9385ea5c6 Gitweb: http://git.kernel.org/tip/832102671855f73962e7a04fdafd48b9385ea5c6 Author: Toshi Kani AuthorDate: Thu, 17 Sep 2015 12:24:15 -0600 Committer: Thomas Gleixner CommitDate: Tue, 22 Sep 2015 21:27:32 +0200 x86/asm: Move PUD_PAGE macros to page_types.h PUD_SHIFT is defined according to a given kernel configuration, which allows it be commonly used by any x86 kernels. However, PUD_PAGE_SIZE and PUD_PAGE_MASK, which are set from PUD_SHIFT, are defined in page_64_types.h, which can be used by 64-bit kernel only. Move PUD_PAGE_SIZE and PUD_PAGE_MASK to page_types.h so that they can be used by any x86 kernels as well. Signed-off-by: Toshi Kani Cc: Andrew Morton Cc: Juergen Gross Cc: H. Peter Anvin Cc: Ingo Molnar Cc: Borislav Petkov Cc: Konrad Wilk Cc: Robert Elliot Cc: linux-mm@kvack.org Link: http://lkml.kernel.org/r/1442514264-12475-3-git-send-email-toshi.kani@hpe.com Signed-off-by: Thomas Gleixner --- arch/x86/include/asm/page_64_types.h | 3 --- arch/x86/include/asm/page_types.h | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h index 4edd53b..4928cf0 100644 --- a/arch/x86/include/asm/page_64_types.h +++ b/arch/x86/include/asm/page_64_types.h @@ -26,9 +26,6 @@ #define MCE_STACK 4 #define N_EXCEPTION_STACKS 4 /* hw limit: 7 */ -#define PUD_PAGE_SIZE (_AC(1, UL) << PUD_SHIFT) -#define PUD_PAGE_MASK (~(PUD_PAGE_SIZE-1)) - /* * Set __PAGE_OFFSET to the most negative possible address + * PGDIR_SIZE*16 (pgd slot 272). The gap is to allow a space for a diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h index c7c712f..c5b7fb2 100644 --- a/arch/x86/include/asm/page_types.h +++ b/arch/x86/include/asm/page_types.h @@ -20,6 +20,9 @@ #define PMD_PAGE_SIZE (_AC(1, UL) << PMD_SHIFT) #define PMD_PAGE_MASK (~(PMD_PAGE_SIZE-1)) +#define PUD_PAGE_SIZE (_AC(1, UL) << PUD_SHIFT) +#define PUD_PAGE_MASK (~(PUD_PAGE_SIZE-1)) + #define HPAGE_SHIFT PMD_SHIFT #define HPAGE_SIZE (_AC(1,UL) << HPAGE_SHIFT) #define HPAGE_MASK (~(HPAGE_SIZE - 1))