From 116c4f305802802c66b73e5f57cc177ccc8a75b3 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Wed, 30 Jan 2008 13:32:42 +0100 Subject: [PATCH] --- yaml --- r: 80167 b: refs/heads/master c: 3da1bcc2659de27094592e5a037d0b1d59351e03 h: refs/heads/master i: 80165: 6f3f0d5319eff870586d88f5bb894113f4d7989f 80163: 3493250ecfd2bb7a6eaa26c49cf962c58e402f9a 80159: e3355ff995b519ef0a8bbb57096a719c90be36d7 v: v3 --- [refs] | 2 +- trunk/include/asm-x86/page.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5c8586c536b2..29593bc71a95 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74ef649fe847fdfbd3e1732d21b923f59ca04e8c +refs/heads/master: 3da1bcc2659de27094592e5a037d0b1d59351e03 diff --git a/trunk/include/asm-x86/page.h b/trunk/include/asm-x86/page.h index 2ebb6977e00c..911d7e0b3cd9 100644 --- a/trunk/include/asm-x86/page.h +++ b/trunk/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))