From f9aa6ffd213866ae8a619a2f9f1481716857ab8f Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 26 Mar 2008 09:07:52 +0000 Subject: [PATCH] xen, i386: Fix non-PAE build failure. Signed-off-by: Keir Fraser --- include/asm-i386/mach-xen/asm/page.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/asm-i386/mach-xen/asm/page.h b/include/asm-i386/mach-xen/asm/page.h index 8276a657..c3af9dbe 100644 --- a/include/asm-i386/mach-xen/asm/page.h +++ b/include/asm-i386/mach-xen/asm/page.h @@ -126,9 +126,10 @@ typedef struct { unsigned long pgprot; } pgprot_t; == _PAGE_PRESENT ? \ machine_to_phys(__pte_val(x)) : \ __pte_val(x)) -#define __pte(x) ({ unsigned long _x = (x); \ - (pte_t)(((_x) & (_PAGE_PRESENT|_PAGE_IO)) == _PAGE_PRESENT ? \ - phys_to_machine(_x) : (_x)); }) +#define __pte(x) ({ unsigned long _x = (x); \ + if ((_x & (_PAGE_PRESENT|_PAGE_IO)) == _PAGE_PRESENT) \ + _x = phys_to_machine(_x); \ + ((pte_t) { _x }); }) #define __pmd_val(x) __pud_val((x).pud) #define __pud_val(x) __pgd_val((x).pgd) #define __pgd(x) ({ unsigned long _x = (x); \ -- 2.39.5