diff --git a/[refs] b/[refs] index 5f92ebccbbbd..ebc99e32a0bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3edea4833a1efcd43e1dff082bc8001fdfe74b34 +refs/heads/master: 75cd968ab251ac84dd3a5dc252af7036dc4a64f4 diff --git a/trunk/include/asm-um/page.h b/trunk/include/asm-um/page.h index 5afee8a8cdf3..f58aedadeb4e 100644 --- a/trunk/include/asm-um/page.h +++ b/trunk/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))