diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:01:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-29 19:01:43 -0400 |
| commit | da61396d24e37258817e42537c482e962b4742f7 (patch) | |
| tree | 4293a5d557b8f9fed8a2bac93f1e5c939c7b65c3 /include/asm-um/page.h | |
| parent | 2f058256cb64e346f4fb4499ff4e0f1c2791a4b4 (diff) | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
Merge upstream kernel into libata 'passthru' branch
Diffstat (limited to 'include/asm-um/page.h')
| -rw-r--r-- | include/asm-um/page.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-um/page.h b/include/asm-um/page.h index 5afee8a8cdf3..f58aedadeb4e 100644 --- a/include/asm-um/page.h +++ b/include/asm-um/page.h @@ -104,8 +104,8 @@ extern void *to_virt(unsigned long phys); * casting is the right thing, but 32-bit UML can't have 64-bit virtual * addresses */ -#define __pa(virt) to_phys((void *) (unsigned long) virt) -#define __va(phys) to_virt((unsigned long) phys) +#define __pa(virt) to_phys((void *) (unsigned long) (virt)) +#define __va(phys) to_virt((unsigned long) (phys)) #define page_to_pfn(page) ((page) - mem_map) #define pfn_to_page(pfn) (mem_map + (pfn)) |