Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[PATCH] ppc64: Consolidate some macros
The only caller of chunk_offset() and abs_chunk() is phys_to_abs(), so
fold the former two into the latter.
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
authored by
Michael Ellerman
and committed by
Paul Mackerras
ce217952
56e97b71
+9
-16
include/asm-ppc64/abs_addr.h
+9
-16
include/asm-ppc64/abs_addr.h
···
44
return addr >> MSCHUNKS_CHUNK_SHIFT;
45
}
46
47
-
static inline unsigned long chunk_offset(unsigned long addr)
48
{
49
-
return addr & MSCHUNKS_OFFSET_MASK;
50
}
51
-
52
-
static inline unsigned long abs_chunk(unsigned long pchunk)
53
-
{
54
-
if (pchunk >= mschunks_map.num_chunks)
55
-
return pchunk;
56
-
57
-
return mschunks_map.mapping[pchunk];
58
-
}
59
-
60
-
/* A macro so it can take pointers or unsigned long. */
61
-
#define phys_to_abs(pa) \
62
-
({ unsigned long _pa = (unsigned long)(pa); \
63
-
chunk_to_addr(abs_chunk(addr_to_chunk(_pa))) + chunk_offset(_pa); \
64
-
})
65
66
static inline unsigned long
67
physRpn_to_absRpn(unsigned long rpn)
···
44
return addr >> MSCHUNKS_CHUNK_SHIFT;
45
}
46
47
+
static inline unsigned long phys_to_abs(unsigned long pa)
48
{
49
+
unsigned long chunk;
50
+
51
+
chunk = addr_to_chunk(pa);
52
+
53
+
if (chunk < mschunks_map.num_chunks)
54
+
chunk = mschunks_map.mapping[chunk];
55
+
56
+
return chunk_to_addr(chunk) + (pa & MSCHUNKS_OFFSET_MASK);
57
}
58
59
static inline unsigned long
60
physRpn_to_absRpn(unsigned long rpn)