Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
[PATCH] ppc64: Remove PTRRELOC() from msChunks code
The msChunks code was written to work on pSeries, but now it's only used on
iSeries. This means there's no need to do PTRRELOC anymore, so remove it all.
A few places were getting "extern reloc_offset()" from abs_addr.h, move it
into system.h instead.
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
38e85dc1
aed31351
+1
-9
arch/ppc64/kernel/LparData.c
+1
-9
arch/ppc64/kernel/LparData.c
···
229
229
struct msChunks msChunks;
230
230
EXPORT_SYMBOL(msChunks);
231
231
232
-
/* Depending on whether this is called from iSeries or pSeries setup
233
-
* code, the location of the msChunks struct may or may not have
234
-
* to be reloc'd, so we force the caller to do that for us by passing
235
-
* in a pointer to the structure.
236
-
*/
237
232
unsigned long
238
233
msChunks_alloc(unsigned long mem, unsigned long num_chunks, unsigned long chunk_size)
239
234
{
240
-
unsigned long offset = reloc_offset();
241
-
struct msChunks *_msChunks = PTRRELOC(&msChunks);
242
-
243
235
_msChunks->num_chunks = num_chunks;
244
236
_msChunks->chunk_size = chunk_size;
245
237
_msChunks->chunk_shift = __ilog2(chunk_size);
246
238
_msChunks->chunk_mask = (1UL<<_msChunks->chunk_shift)-1;
247
239
248
240
mem = _ALIGN(mem, sizeof(msChunks_entry));
249
-
_msChunks->abs = (msChunks_entry *)(mem + offset);
241
+
_msChunks->abs = (msChunks_entry *)mem;
250
242
mem += num_chunks * sizeof(msChunks_entry);
251
243
252
244
return mem;
+10
-26
include/asm-ppc64/abs_addr.h
+10
-26
include/asm-ppc64/abs_addr.h
···
29
29
extern struct msChunks msChunks;
30
30
31
31
extern unsigned long msChunks_alloc(unsigned long, unsigned long, unsigned long);
32
-
extern unsigned long reloc_offset(void);
33
32
34
33
#ifdef CONFIG_MSCHUNKS
35
34
36
-
static inline unsigned long
37
-
chunk_to_addr(unsigned long chunk)
35
+
static inline unsigned long chunk_to_addr(unsigned long chunk)
38
36
{
39
-
unsigned long offset = reloc_offset();
40
-
struct msChunks *_msChunks = PTRRELOC(&msChunks);
41
-
42
-
return chunk << _msChunks->chunk_shift;
37
+
return chunk << msChunks.chunk_shift;
43
38
}
44
39
45
-
static inline unsigned long
46
-
addr_to_chunk(unsigned long addr)
40
+
static inline unsigned long addr_to_chunk(unsigned long addr)
47
41
{
48
-
unsigned long offset = reloc_offset();
49
-
struct msChunks *_msChunks = PTRRELOC(&msChunks);
50
-
51
-
return addr >> _msChunks->chunk_shift;
42
+
return addr >> msChunks.chunk_shift;
52
43
}
53
44
54
-
static inline unsigned long
55
-
chunk_offset(unsigned long addr)
45
+
static inline unsigned long chunk_offset(unsigned long addr)
56
46
{
57
-
unsigned long offset = reloc_offset();
58
-
struct msChunks *_msChunks = PTRRELOC(&msChunks);
59
-
60
-
return addr & _msChunks->chunk_mask;
47
+
return addr & msChunks.chunk_mask;
61
48
}
62
49
63
-
static inline unsigned long
64
-
abs_chunk(unsigned long pchunk)
50
+
static inline unsigned long abs_chunk(unsigned long pchunk)
65
51
{
66
-
unsigned long offset = reloc_offset();
67
-
struct msChunks *_msChunks = PTRRELOC(&msChunks);
68
-
if ( pchunk >= _msChunks->num_chunks ) {
52
+
if (pchunk >= msChunks.num_chunks)
69
53
return pchunk;
70
-
}
71
-
return PTRRELOC(_msChunks->abs)[pchunk];
54
+
55
+
return msChunks.abs[pchunk];
72
56
}
73
57
74
58
/* A macro so it can take pointers or unsigned long. */