Commit 56e97b71bf55edb69dc8e9715553972ce50b1564
Committed by
Paul Mackerras
Paul Mackerras
1 parent
34c8f6961f
Exists in
master
and in
4 other branches
[PATCH] ppc64: Rename msChunks structure
Rename the msChunks struct to get rid of the StUdlY caps and make it a bit clearer what it's for. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Showing 3 changed files with 18 additions and 18 deletions Side-by-side Diff
arch/ppc64/kernel/head.S
| ... | ... | @@ -96,12 +96,12 @@ |
| 96 | 96 | .llong hvReleaseData-KERNELBASE |
| 97 | 97 | |
| 98 | 98 | /* |
| 99 | - * At offset 0x28 and 0x30 are offsets to the msChunks | |
| 99 | + * At offset 0x28 and 0x30 are offsets to the mschunks_map | |
| 100 | 100 | * array (used by the iSeries LPAR debugger to do translation |
| 101 | 101 | * between physical addresses and absolute addresses) and |
| 102 | 102 | * to the pidhash table (also used by the debugger) |
| 103 | 103 | */ |
| 104 | - .llong msChunks-KERNELBASE | |
| 104 | + .llong mschunks_map-KERNELBASE | |
| 105 | 105 | .llong 0 /* pidhash-KERNELBASE SFRXXX */ |
| 106 | 106 | |
| 107 | 107 | /* Offset 0x38 - Pointer to start of embedded System.map */ |
arch/ppc64/kernel/iSeries_setup.c
| ... | ... | @@ -415,20 +415,20 @@ |
| 415 | 415 | DBG(" <- iSeries_init_early()\n"); |
| 416 | 416 | } |
| 417 | 417 | |
| 418 | -struct msChunks msChunks = { | |
| 418 | +struct mschunks_map mschunks_map = { | |
| 419 | 419 | /* XXX We don't use these, but Piranha might need them. */ |
| 420 | 420 | .chunk_size = MSCHUNKS_CHUNK_SIZE, |
| 421 | 421 | .chunk_shift = MSCHUNKS_CHUNK_SHIFT, |
| 422 | 422 | .chunk_mask = MSCHUNKS_OFFSET_MASK, |
| 423 | 423 | }; |
| 424 | -EXPORT_SYMBOL(msChunks); | |
| 424 | +EXPORT_SYMBOL(mschunks_map); | |
| 425 | 425 | |
| 426 | -void msChunks_alloc(unsigned long num_chunks) | |
| 426 | +void mschunks_alloc(unsigned long num_chunks) | |
| 427 | 427 | { |
| 428 | 428 | klimit = _ALIGN(klimit, sizeof(u32)); |
| 429 | - msChunks.abs = (u32 *)klimit; | |
| 429 | + mschunks_map.mapping = (u32 *)klimit; | |
| 430 | 430 | klimit += num_chunks * sizeof(u32); |
| 431 | - msChunks.num_chunks = num_chunks; | |
| 431 | + mschunks_map.num_chunks = num_chunks; | |
| 432 | 432 | } |
| 433 | 433 | |
| 434 | 434 | /* |
| ... | ... | @@ -468,7 +468,7 @@ |
| 468 | 468 | |
| 469 | 469 | /* Chunk size on iSeries is 256K bytes */ |
| 470 | 470 | totalChunks = (u32)HvLpConfig_getMsChunks(); |
| 471 | - msChunks_alloc(totalChunks); | |
| 471 | + mschunks_alloc(totalChunks); | |
| 472 | 472 | |
| 473 | 473 | /* |
| 474 | 474 | * Get absolute address of our load area |
| ... | ... | @@ -505,7 +505,7 @@ |
| 505 | 505 | printk("Load area size %dK\n", loadAreaSize * 256); |
| 506 | 506 | |
| 507 | 507 | for (nextPhysChunk = 0; nextPhysChunk < loadAreaSize; ++nextPhysChunk) |
| 508 | - msChunks.abs[nextPhysChunk] = | |
| 508 | + mschunks_map.mapping[nextPhysChunk] = | |
| 509 | 509 | loadAreaFirstChunk + nextPhysChunk; |
| 510 | 510 | |
| 511 | 511 | /* |
| ... | ... | @@ -571,7 +571,8 @@ |
| 571 | 571 | (absChunk > hptLastChunk)) && |
| 572 | 572 | ((absChunk < loadAreaFirstChunk) || |
| 573 | 573 | (absChunk > loadAreaLastChunk))) { |
| 574 | - msChunks.abs[nextPhysChunk] = absChunk; | |
| 574 | + mschunks_map.mapping[nextPhysChunk] = | |
| 575 | + absChunk; | |
| 575 | 576 | ++nextPhysChunk; |
| 576 | 577 | } |
| 577 | 578 | } |
include/asm-ppc64/abs_addr.h
| ... | ... | @@ -17,19 +17,18 @@ |
| 17 | 17 | #include <asm/prom.h> |
| 18 | 18 | #include <asm/lmb.h> |
| 19 | 19 | |
| 20 | -struct msChunks { | |
| 20 | +#ifdef CONFIG_MSCHUNKS | |
| 21 | + | |
| 22 | +struct mschunks_map { | |
| 21 | 23 | unsigned long num_chunks; |
| 22 | 24 | unsigned long chunk_size; |
| 23 | 25 | unsigned long chunk_shift; |
| 24 | 26 | unsigned long chunk_mask; |
| 25 | - u32 *abs; | |
| 27 | + u32 *mapping; | |
| 26 | 28 | }; |
| 27 | 29 | |
| 28 | -extern struct msChunks msChunks; | |
| 30 | +extern struct mschunks_map mschunks_map; | |
| 29 | 31 | |
| 30 | - | |
| 31 | -#ifdef CONFIG_MSCHUNKS | |
| 32 | - | |
| 33 | 32 | /* Chunks are 256 KB */ |
| 34 | 33 | #define MSCHUNKS_CHUNK_SHIFT (18) |
| 35 | 34 | #define MSCHUNKS_CHUNK_SIZE (1UL << MSCHUNKS_CHUNK_SHIFT) |
| 36 | 35 | |
| ... | ... | @@ -52,10 +51,10 @@ |
| 52 | 51 | |
| 53 | 52 | static inline unsigned long abs_chunk(unsigned long pchunk) |
| 54 | 53 | { |
| 55 | - if (pchunk >= msChunks.num_chunks) | |
| 54 | + if (pchunk >= mschunks_map.num_chunks) | |
| 56 | 55 | return pchunk; |
| 57 | 56 | |
| 58 | - return msChunks.abs[pchunk]; | |
| 57 | + return mschunks_map.mapping[pchunk]; | |
| 59 | 58 | } |
| 60 | 59 | |
| 61 | 60 | /* A macro so it can take pointers or unsigned long. */ |