diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:23 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-25 12:24:23 +0200 |
commit | 3fef475e136e80f31d325c60641dc39e4c51698c (patch) | |
tree | ec4f576c591988ee8c0413d6e4a188e63298b903 /include/asm-x86/xen/page.h | |
parent | 1e2697b1ce312f76ecc70051b9298317a4f1f944 (diff) | |
parent | 543cf4cb3fe6f6cae3651ba918b9c56200b257d0 (diff) |
Merge branch 'linus' into kmemchecktip-kmemcheck-2008-06-25_10.24_Wed
Diffstat (limited to 'include/asm-x86/xen/page.h')
-rw-r--r-- | include/asm-x86/xen/page.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-x86/xen/page.h b/include/asm-x86/xen/page.h index baf3a4dce28c..e11f24038b1d 100644 --- a/include/asm-x86/xen/page.h +++ b/include/asm-x86/xen/page.h @@ -150,13 +150,9 @@ static inline pte_t __pte_ma(pteval_t x) return (pte_t) { .pte = x }; } -#ifdef CONFIG_X86_PAE #define pmd_val_ma(v) ((v).pmd) #define pud_val_ma(v) ((v).pgd.pgd) #define __pmd_ma(x) ((pmd_t) { (x) } ) -#else /* !X86_PAE */ -#define pmd_val_ma(v) ((v).pud.pgd.pgd) -#endif /* CONFIG_X86_PAE */ #define pgd_val_ma(x) ((x).pgd) |