Commit 83210267 authored Sep 17, 2015 by Toshi Kani Committed by Thomas Gleixner Sep 22, 2015

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 <toshi.kani@hpe.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Juergen Gross <jgross@suse.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Konrad Wilk <konrad.wilk@oracle.com>
Cc: Robert Elliot <elliott@hpe.com>
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 <tglx@linutronix.de>

parent fb535ccb

arch/x86/include/asm/page_64_types.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -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

arch/x86/include/asm/page_types.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -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))