diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2012-07-25 23:19:47 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-09-05 07:18:42 +0200 |
| commit | c6e565f2bef551326b65d801206d688708f1eeb5 (patch) | |
| tree | a184d8e7ebaf9b53f85d09377ba75b25a3e07735 /arch/powerpc/include | |
| parent | Linux 3.6-rc1 (diff) | |
| download | linux-c6e565f2bef551326b65d801206d688708f1eeb5.tar.xz linux-c6e565f2bef551326b65d801206d688708f1eeb5.zip | |
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>
Diffstat (limited to 'arch/powerpc/include')
| -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 @@ #include <asm/page.h> #include <asm/prom.h> -struct mschunks_map { - unsigned long num_chunks; - unsigned long chunk_size; - unsigned long chunk_shift; - unsigned long chunk_mask; - u32 *mapping; -}; - -extern struct mschunks_map mschunks_map; - -/* Chunks are 256 KB */ -#define MSCHUNKS_CHUNK_SHIFT (18) -#define MSCHUNKS_CHUNK_SIZE (1UL << MSCHUNKS_CHUNK_SHIFT) -#define MSCHUNKS_OFFSET_MASK (MSCHUNKS_CHUNK_SIZE - 1) - -static inline unsigned long chunk_to_addr(unsigned long chunk) -{ - return chunk << MSCHUNKS_CHUNK_SHIFT; -} - -static inline unsigned long addr_to_chunk(unsigned long addr) -{ - return addr >> MSCHUNKS_CHUNK_SHIFT; -} - -static inline unsigned long phys_to_abs(unsigned long pa) -{ - return pa; -} +#define phys_to_abs(pa) (pa) /* Convenience macros */ -#define virt_to_abs(va) phys_to_abs(__pa(va)) +#define virt_to_abs(va) __pa(va) #define abs_to_virt(aa) __va(aa) #endif /* __KERNEL__ */ |