From: Ingo Molnar Date: Wed, 30 Jan 2008 12:32:42 +0000 (+0100) Subject: x86: page.h: move and unify types for pagetable entry, #1 X-Git-Tag: v2.6.25-rc1~1143^2~408 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=3da1bcc2659de27094592e5a037d0b1d59351e03;p=linux-2.6-omap-h63xx.git x86: page.h: move and unify types for pagetable entry, #1 based on: Subject: x86: page.h: move and unify types for pagetable entry From: Jeremy Fitzhardinge Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h index 2ebb6977e00..911d7e0b3cd 100644 --- a/include/asm-x86/page.h +++ b/include/asm-x86/page.h @@ -9,6 +9,7 @@ #define PAGE_MASK (~(PAGE_SIZE-1)) #define PHYSICAL_PAGE_MASK (PAGE_MASK & __PHYSICAL_MASK) +#define PTE_MASK PHYSICAL_PAGE_MASK #define LARGE_PAGE_SIZE (_AC(1,UL) << PMD_SHIFT) #define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1)) @@ -24,8 +25,13 @@ #define __PHYSICAL_MASK ((_AC(1,UL) << __PHYSICAL_MASK_SHIFT) - 1) #define __VIRTUAL_MASK ((_AC(1,UL) << __VIRTUAL_MASK_SHIFT) - 1) +#ifndef __ASSEMBLY__ +#include +#endif #ifdef CONFIG_X86_64 +#define PAGETABLE_LEVELS 4 + #define THREAD_ORDER 1 #define THREAD_SIZE (PAGE_SIZE << THREAD_ORDER) #define CURRENT_MASK (~(THREAD_SIZE-1))