diff options
Diffstat (limited to 'include/asm-ppc64')
-rw-r--r-- | include/asm-ppc64/abs_addr.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-ppc64/abs_addr.h b/include/asm-ppc64/abs_addr.h index ab4320c1cf5b..200db1c45f29 100644 --- a/include/asm-ppc64/abs_addr.h +++ b/include/asm-ppc64/abs_addr.h | |||
@@ -56,9 +56,6 @@ static inline unsigned long phys_to_abs(unsigned long pa) | |||
56 | return chunk_to_addr(chunk) + (pa & MSCHUNKS_OFFSET_MASK); | 56 | return chunk_to_addr(chunk) + (pa & MSCHUNKS_OFFSET_MASK); |
57 | } | 57 | } |
58 | 58 | ||
59 | /* A macro so it can take pointers or unsigned long. */ | ||
60 | #define abs_to_phys(aa) lmb_abs_to_phys((unsigned long)(aa)) | ||
61 | |||
62 | #else /* !CONFIG_MSCHUNKS */ | 59 | #else /* !CONFIG_MSCHUNKS */ |
63 | 60 | ||
64 | #define chunk_to_addr(chunk) ((unsigned long)(chunk)) | 61 | #define chunk_to_addr(chunk) ((unsigned long)(chunk)) |
@@ -68,12 +65,11 @@ static inline unsigned long phys_to_abs(unsigned long pa) | |||
68 | 65 | ||
69 | #define phys_to_abs(pa) (pa) | 66 | #define phys_to_abs(pa) (pa) |
70 | #define physRpn_to_absRpn(rpn) (rpn) | 67 | #define physRpn_to_absRpn(rpn) (rpn) |
71 | #define abs_to_phys(aa) (aa) | ||
72 | 68 | ||
73 | #endif /* !CONFIG_MSCHUNKS */ | 69 | #endif /* !CONFIG_MSCHUNKS */ |
74 | 70 | ||
75 | /* Convenience macros */ | 71 | /* Convenience macros */ |
76 | #define virt_to_abs(va) phys_to_abs(__pa(va)) | 72 | #define virt_to_abs(va) phys_to_abs(__pa(va)) |
77 | #define abs_to_virt(aa) __va(abs_to_phys(aa)) | 73 | #define abs_to_virt(aa) __va(aa) |
78 | 74 | ||
79 | #endif /* _ABS_ADDR_H */ | 75 | #endif /* _ABS_ADDR_H */ |