summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-16 02:40:46 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-16 02:40:46 +0200
commit75cd968ab251ac84dd3a5dc252af7036dc4a64f4 (patch)
tree4c8114135ba89878af4cc0240e776fbd68c976c0
parent[PATCH] intelfb/fbdev: Save info->flags in a local variable (diff)
downloadlinux-75cd968ab251ac84dd3a5dc252af7036dc4a64f4.tar.xz
linux-75cd968ab251ac84dd3a5dc252af7036dc4a64f4.zip
um: fix __pa/__va macro expansion problem
Proper parentheses around arguments needed, especially as the macros use a high-precedence cast operator on the argument.
-rw-r--r--include/asm-um/page.h4
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))