summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-24 11:21:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-24 11:21:47 -0700
commit9bf8a943ad79a3bb15597fe0275f8b1cf26e2010 (patch)
tree9d5ce8b4ccdf17a67e437d6bd1954ff20be7273c /include
parent3b968b7c10b3d81eb83380655484f2bb5b240dc6 (diff)
parent28499143933f19b28008a556ed59255d6009391a (diff)
downloadlinux-9bf8a943ad79a3bb15597fe0275f8b1cf26e2010.tar.bz2
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: xen: remove support for non-PAE 32-bit
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/xen/page.h4
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)