diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
| commit | ceeec3dc375e3b0618f16b34efc56fe093918f8b (patch) | |
| tree | 2293d02721ee05131aaf1c60e4fba7e281585eec /include/asm-m68k/page.h | |
| parent | fbff868db3a4cc6a89d51da9a6d49b26c29d04fb (diff) | |
| parent | e3ee3b78f83688a0ae4315e8be71b2eac559904a (diff) | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'include/asm-m68k/page.h')
| -rw-r--r-- | include/asm-m68k/page.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-m68k/page.h b/include/asm-m68k/page.h index 99a516709210..206313e2a817 100644 --- a/include/asm-m68k/page.h +++ b/include/asm-m68k/page.h | |||
| @@ -138,13 +138,13 @@ extern unsigned long m68k_memoffset; | |||
| 138 | #define __pa(vaddr) ((unsigned long)(vaddr)+m68k_memoffset) | 138 | #define __pa(vaddr) ((unsigned long)(vaddr)+m68k_memoffset) |
| 139 | #define __va(paddr) ((void *)((unsigned long)(paddr)-m68k_memoffset)) | 139 | #define __va(paddr) ((void *)((unsigned long)(paddr)-m68k_memoffset)) |
| 140 | #else | 140 | #else |
| 141 | #define __pa(vaddr) virt_to_phys((void *)vaddr) | 141 | #define __pa(vaddr) virt_to_phys((void *)(vaddr)) |
| 142 | #define __va(paddr) phys_to_virt((unsigned long)paddr) | 142 | #define __va(paddr) phys_to_virt((unsigned long)(paddr)) |
| 143 | #endif | 143 | #endif |
| 144 | 144 | ||
| 145 | #else /* !CONFIG_SUN3 */ | 145 | #else /* !CONFIG_SUN3 */ |
| 146 | /* This #define is a horrible hack to suppress lots of warnings. --m */ | 146 | /* This #define is a horrible hack to suppress lots of warnings. --m */ |
| 147 | #define __pa(x) ___pa((unsigned long)x) | 147 | #define __pa(x) ___pa((unsigned long)(x)) |
| 148 | static inline unsigned long ___pa(unsigned long x) | 148 | static inline unsigned long ___pa(unsigned long x) |
| 149 | { | 149 | { |
| 150 | if(x == 0) | 150 | if(x == 0) |