diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-10-17 12:20:26 -0400 |
| commit | 651dab4264e4ba0e563f5ff56f748127246e9065 (patch) | |
| tree | 016630974bdcb00fe529b673f96d389e0fd6dc94 /arch/powerpc/include/asm/io.h | |
| parent | 40b8606253552109815786e5d4b0de98782d31f5 (diff) | |
| parent | 2e532d68a2b3e2aa6b19731501222069735c741c (diff) | |
Merge commit 'linus/master' into merge-linus
Conflicts:
arch/x86/kvm/i8254.c
Diffstat (limited to 'arch/powerpc/include/asm/io.h')
| -rw-r--r-- | arch/powerpc/include/asm/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h index 77c7fa025e65..08266d2728b3 100644 --- a/arch/powerpc/include/asm/io.h +++ b/arch/powerpc/include/asm/io.h | |||
| @@ -711,7 +711,7 @@ static inline void * phys_to_virt(unsigned long address) | |||
| 711 | /* | 711 | /* |
| 712 | * Change "struct page" to physical address. | 712 | * Change "struct page" to physical address. |
| 713 | */ | 713 | */ |
| 714 | #define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT) | 714 | #define page_to_phys(page) ((phys_addr_t)page_to_pfn(page) << PAGE_SHIFT) |
| 715 | 715 | ||
| 716 | /* We do NOT want virtual merging, it would put too much pressure on | 716 | /* We do NOT want virtual merging, it would put too much pressure on |
| 717 | * our iommu allocator. Instead, we want drivers to be smart enough | 717 | * our iommu allocator. Instead, we want drivers to be smart enough |