diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2012-07-25 17:19:47 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-05 01:18:42 -0400 |
commit | c6e565f2bef551326b65d801206d688708f1eeb5 (patch) | |
tree | a184d8e7ebaf9b53f85d09377ba75b25a3e07735 | |
parent | 0d7614f09c1ebdbaa1599a5aba7593f147bf96ee (diff) |
powerpc: Remove remaining iSeries chunks
In commit f5339277 "powerpc: Remove FW_FEATURE ISERIES from arch code", we
removed the bulk of the iSeries code, but missed a few bits.
Remove the mschunks bits, these were only ever used on iSeries as far as I
know, and are definitely not used anymore.
Make it even clearer that phys_to_abs() is a nop, by making it a macro. We
still have a few users of this, but should clean those up.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r-- | arch/powerpc/include/asm/abs_addr.h | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/arch/powerpc/include/asm/abs_addr.h b/arch/powerpc/include/asm/abs_addr.h index 9d92ba04b033..419aab7176a2 100644 --- a/arch/powerpc/include/asm/abs_addr.h +++ b/arch/powerpc/include/asm/abs_addr.h | |||
@@ -18,38 +18,10 @@ | |||
18 | #include <asm/page.h> | 18 | #include <asm/page.h> |
19 | #include <asm/prom.h> | 19 | #include <asm/prom.h> |
20 | 20 | ||
21 | struct mschunks_map { | 21 | #define phys_to_abs(pa) (pa) |
22 | unsigned long num_chunks; | ||
23 | unsigned long chunk_size; | ||
24 | unsigned long chunk_shift; | ||
25 | unsigned long chunk_mask; | ||
26 | u32 *mapping; | ||
27 | }; | ||
28 | |||
29 | extern struct mschunks_map mschunks_map; | ||
30 | |||
31 | /* Chunks are 256 KB */ | ||
32 | #define MSCHUNKS_CHUNK_SHIFT (18) | ||
33 | #define MSCHUNKS_CHUNK_SIZE (1UL << MSCHUNKS_CHUNK_SHIFT) | ||
34 | #define MSCHUNKS_OFFSET_MASK (MSCHUNKS_CHUNK_SIZE - 1) | ||
35 | |||
36 | static inline unsigned long chunk_to_addr(unsigned long chunk) | ||
37 | { | ||
38 | return chunk << MSCHUNKS_CHUNK_SHIFT; | ||
39 | } | ||
40 | |||
41 | static inline unsigned long addr_to_chunk(unsigned long addr) | ||
42 | { | ||
43 | return addr >> MSCHUNKS_CHUNK_SHIFT; | ||
44 | } | ||
45 | |||
46 | static inline unsigned long phys_to_abs(unsigned long pa) | ||
47 | { | ||
48 | return pa; | ||
49 | } | ||
50 | 22 | ||
51 | /* Convenience macros */ | 23 | /* Convenience macros */ |
52 | #define virt_to_abs(va) phys_to_abs(__pa(va)) | 24 | #define virt_to_abs(va) __pa(va) |
53 | #define abs_to_virt(aa) __va(aa) | 25 | #define abs_to_virt(aa) __va(aa) |
54 | 26 | ||
55 | #endif /* __KERNEL__ */ | 27 | #endif /* __KERNEL__ */ |