Skip to content

Commit

Permalink
powerpc: Remove remaining iSeries chunks
Browse files Browse the repository at this point in the history
In commit f533927 "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>
  • Loading branch information
Michael Ellerman authored and Benjamin Herrenschmidt committed Sep 5, 2012
1 parent 0d7614f commit c6e565f
Showing 1 changed file with 2 additions and 30 deletions.
32 changes: 2 additions & 30 deletions arch/powerpc/include/asm/abs_addr.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */
Expand Down

0 comments on commit c6e565f

Please sign in to comment.