From 4257b9cf26a420e1bc019dffa652d2bbe79676cc Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Wed, 24 Aug 2005 17:36:21 +0200 Subject: [PATCH] --- yaml --- r: 5991 b: refs/heads/master c: 40bb0c3ef52d872de348e10000eb5432a43a147d h: refs/heads/master i: 5989: 43fc4b8beda0c26479f8e897decc3e51a14fd12b 5987: a01c1a8c0a1c79cc61eb05bb684f35f2ef38b71f 5983: 19b9f435c9c80f9b862dcce3fa7a19b07c3d60b5 v: v3 --- [refs] | 2 +- trunk/include/asm-m68k/page.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ed6b2a4161c8..5d806b39340d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf +refs/heads/master: 40bb0c3ef52d872de348e10000eb5432a43a147d diff --git a/trunk/include/asm-m68k/page.h b/trunk/include/asm-m68k/page.h index 99a516709210..206313e2a817 100644 --- a/trunk/include/asm-m68k/page.h +++ b/trunk/include/asm-m68k/page.h @@ -138,13 +138,13 @@ extern unsigned long m68k_memoffset; #define __pa(vaddr) ((unsigned long)(vaddr)+m68k_memoffset) #define __va(paddr) ((void *)((unsigned long)(paddr)-m68k_memoffset)) #else -#define __pa(vaddr) virt_to_phys((void *)vaddr) -#define __va(paddr) phys_to_virt((unsigned long)paddr) +#define __pa(vaddr) virt_to_phys((void *)(vaddr)) +#define __va(paddr) phys_to_virt((unsigned long)(paddr)) #endif #else /* !CONFIG_SUN3 */ /* This #define is a horrible hack to suppress lots of warnings. --m */ -#define __pa(x) ___pa((unsigned long)x) +#define __pa(x) ___pa((unsigned long)(x)) static inline unsigned long ___pa(unsigned long x) { if(x == 0)