ia64/xen-unstable

changeset 6067:08bc755fe796

Fix page_to_phys() macro as suggested by Gerd.
author kaf24@firebug.cl.cam.ac.uk
date Mon Aug 08 17:00:21 2005 +0000 (2005-08-08)
parents dcb2b7a1c621
children 0229efe8ffe4
files xen/include/asm-x86/io.h
line diff
     1.1 --- a/xen/include/asm-x86/io.h	Mon Aug 08 16:51:02 2005 +0000
     1.2 +++ b/xen/include/asm-x86/io.h	Mon Aug 08 17:00:21 2005 +0000
     1.3 @@ -2,6 +2,7 @@
     1.4  #define _ASM_IO_H
     1.5  
     1.6  #include <xen/config.h>
     1.7 +#include <xen/types.h>
     1.8  #include <asm/page.h>
     1.9  
    1.10  #define IO_SPACE_LIMIT 0xffff
    1.11 @@ -45,11 +46,7 @@ static inline void * phys_to_virt(unsign
    1.12  /*
    1.13   * Change "struct pfn_info" to physical address.
    1.14   */
    1.15 -#ifdef CONFIG_HIGHMEM64G
    1.16 -#define page_to_phys(page)  ((u64)(page - frame_table) << PAGE_SHIFT)
    1.17 -#else
    1.18 -#define page_to_phys(page)  ((page - frame_table) << PAGE_SHIFT)
    1.19 -#endif
    1.20 +#define page_to_phys(page)  ((physaddr_t)(page - frame_table) << PAGE_SHIFT)
    1.21  
    1.22  #define page_to_pfn(_page)  ((unsigned long)((_page) - frame_table))
    1.23  #define page_to_virt(_page) phys_to_virt(page_to_phys(_page))