ia64/linux-2.6.18-xen.hg
changeset 494:1327b9dcc63a
xen, i386: Fix non-PAE build failure.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author | Keir Fraser <keir.fraser@citrix.com> |
---|---|
date | Wed Mar 26 09:07:52 2008 +0000 (2008-03-26) |
parents | 92f7b3144f41 |
children | 542209a3e7e9 |
files | include/asm-i386/mach-xen/asm/page.h |
line diff
1.1 --- a/include/asm-i386/mach-xen/asm/page.h Wed Mar 26 08:54:24 2008 +0000 1.2 +++ b/include/asm-i386/mach-xen/asm/page.h Wed Mar 26 09:07:52 2008 +0000 1.3 @@ -126,9 +126,10 @@ typedef struct { unsigned long pgprot; } 1.4 == _PAGE_PRESENT ? \ 1.5 machine_to_phys(__pte_val(x)) : \ 1.6 __pte_val(x)) 1.7 -#define __pte(x) ({ unsigned long _x = (x); \ 1.8 - (pte_t)(((_x) & (_PAGE_PRESENT|_PAGE_IO)) == _PAGE_PRESENT ? \ 1.9 - phys_to_machine(_x) : (_x)); }) 1.10 +#define __pte(x) ({ unsigned long _x = (x); \ 1.11 + if ((_x & (_PAGE_PRESENT|_PAGE_IO)) == _PAGE_PRESENT) \ 1.12 + _x = phys_to_machine(_x); \ 1.13 + ((pte_t) { _x }); }) 1.14 #define __pmd_val(x) __pud_val((x).pud) 1.15 #define __pud_val(x) __pgd_val((x).pgd) 1.16 #define __pgd(x) ({ unsigned long _x = (x); \