diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-11-19 01:10:57 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-02 21:56:27 -0500 |
commit | 5db9abd9361c491411448edbf2ef1696caef9fee (patch) | |
tree | 34101d6ae1aabec974a88a48dd8f687e76c08ee2 /arch | |
parent | 26b6d5b170815ab0586ff983b4ce7c8cc19e1e81 (diff) |
[POWERPC] iSeries: Fix sparse warnings in setup.c
arch/powerpc/platforms/iseries/setup.c:111:27: warning: constant 0x100000000 is so big it is long
arch/powerpc/platforms/iseries/setup.c:113:23: warning: constant 0x100000000 is so big it is long
arch/powerpc/platforms/iseries/setup.c:117:27: warning: constant 0x000fffffffffffff is so big it is long
arch/powerpc/platforms/iseries/setup.c:127:28: warning: constant 0x100000000 is so big it is long
arch/powerpc/platforms/iseries/setup.c:129:24: warning: constant 0x100000000 is so big it is long
arch/powerpc/platforms/iseries/setup.c:233:5: warning: constant 0x000fffffffffffff is so big it is long
arch/powerpc/platforms/iseries/setup.c:235:5: warning: constant 0x000fffffffffffff is so big it is long
arch/powerpc/platforms/iseries/setup.c:319:6: warning: symbol 'mschunks_alloc' was not declared. Should it be static?
arch/powerpc/platforms/iseries/setup.c:661:6: warning: symbol 'iSeries_early_setup' was not declared. Should it be static?
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.c | 16 | ||||
-rw-r--r-- | arch/powerpc/platforms/iseries/setup.h | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/arch/powerpc/platforms/iseries/setup.c b/arch/powerpc/platforms/iseries/setup.c index 8a652da2afc3..2175a71800d5 100644 --- a/arch/powerpc/platforms/iseries/setup.c +++ b/arch/powerpc/platforms/iseries/setup.c | |||
@@ -108,13 +108,13 @@ static unsigned long iSeries_process_Condor_mainstore_vpd( | |||
108 | * correctly. | 108 | * correctly. |
109 | */ | 109 | */ |
110 | mb_array[0].logicalStart = 0; | 110 | mb_array[0].logicalStart = 0; |
111 | mb_array[0].logicalEnd = 0x100000000; | 111 | mb_array[0].logicalEnd = 0x100000000UL; |
112 | mb_array[0].absStart = 0; | 112 | mb_array[0].absStart = 0; |
113 | mb_array[0].absEnd = 0x100000000; | 113 | mb_array[0].absEnd = 0x100000000UL; |
114 | 114 | ||
115 | if (holeSize) { | 115 | if (holeSize) { |
116 | numMemoryBlocks = 2; | 116 | numMemoryBlocks = 2; |
117 | holeStart = holeStart & 0x000fffffffffffff; | 117 | holeStart = holeStart & 0x000fffffffffffffUL; |
118 | holeStart = addr_to_chunk(holeStart); | 118 | holeStart = addr_to_chunk(holeStart); |
119 | holeFirstChunk = holeStart; | 119 | holeFirstChunk = holeStart; |
120 | holeSize = addr_to_chunk(holeSize); | 120 | holeSize = addr_to_chunk(holeSize); |
@@ -124,9 +124,9 @@ static unsigned long iSeries_process_Condor_mainstore_vpd( | |||
124 | mb_array[0].logicalEnd = holeFirstChunk; | 124 | mb_array[0].logicalEnd = holeFirstChunk; |
125 | mb_array[0].absEnd = holeFirstChunk; | 125 | mb_array[0].absEnd = holeFirstChunk; |
126 | mb_array[1].logicalStart = holeFirstChunk; | 126 | mb_array[1].logicalStart = holeFirstChunk; |
127 | mb_array[1].logicalEnd = 0x100000000 - holeSizeChunks; | 127 | mb_array[1].logicalEnd = 0x100000000UL - holeSizeChunks; |
128 | mb_array[1].absStart = holeFirstChunk + holeSizeChunks; | 128 | mb_array[1].absStart = holeFirstChunk + holeSizeChunks; |
129 | mb_array[1].absEnd = 0x100000000; | 129 | mb_array[1].absEnd = 0x100000000UL; |
130 | } | 130 | } |
131 | return numMemoryBlocks; | 131 | return numMemoryBlocks; |
132 | } | 132 | } |
@@ -230,9 +230,9 @@ static unsigned long iSeries_process_Regatta_mainstore_vpd( | |||
230 | mb_array[i].logicalEnd, | 230 | mb_array[i].logicalEnd, |
231 | mb_array[i].absStart, mb_array[i].absEnd); | 231 | mb_array[i].absStart, mb_array[i].absEnd); |
232 | mb_array[i].absStart = addr_to_chunk(mb_array[i].absStart & | 232 | mb_array[i].absStart = addr_to_chunk(mb_array[i].absStart & |
233 | 0x000fffffffffffff); | 233 | 0x000fffffffffffffUL); |
234 | mb_array[i].absEnd = addr_to_chunk(mb_array[i].absEnd & | 234 | mb_array[i].absEnd = addr_to_chunk(mb_array[i].absEnd & |
235 | 0x000fffffffffffff); | 235 | 0x000fffffffffffffUL); |
236 | mb_array[i].logicalStart = | 236 | mb_array[i].logicalStart = |
237 | addr_to_chunk(mb_array[i].logicalStart); | 237 | addr_to_chunk(mb_array[i].logicalStart); |
238 | mb_array[i].logicalEnd = addr_to_chunk(mb_array[i].logicalEnd); | 238 | mb_array[i].logicalEnd = addr_to_chunk(mb_array[i].logicalEnd); |
@@ -316,7 +316,7 @@ struct mschunks_map mschunks_map = { | |||
316 | }; | 316 | }; |
317 | EXPORT_SYMBOL(mschunks_map); | 317 | EXPORT_SYMBOL(mschunks_map); |
318 | 318 | ||
319 | void mschunks_alloc(unsigned long num_chunks) | 319 | static void mschunks_alloc(unsigned long num_chunks) |
320 | { | 320 | { |
321 | klimit = _ALIGN(klimit, sizeof(u32)); | 321 | klimit = _ALIGN(klimit, sizeof(u32)); |
322 | mschunks_map.mapping = (u32 *)klimit; | 322 | mschunks_map.mapping = (u32 *)klimit; |
diff --git a/arch/powerpc/platforms/iseries/setup.h b/arch/powerpc/platforms/iseries/setup.h index 0a47ac53c959..729754bbb018 100644 --- a/arch/powerpc/platforms/iseries/setup.h +++ b/arch/powerpc/platforms/iseries/setup.h | |||
@@ -17,6 +17,7 @@ | |||
17 | #ifndef __ISERIES_SETUP_H__ | 17 | #ifndef __ISERIES_SETUP_H__ |
18 | #define __ISERIES_SETUP_H__ | 18 | #define __ISERIES_SETUP_H__ |
19 | 19 | ||
20 | extern void *iSeries_early_setup(void); | ||
20 | extern unsigned long iSeries_get_boot_time(void); | 21 | extern unsigned long iSeries_get_boot_time(void); |
21 | extern int iSeries_set_rtc_time(struct rtc_time *tm); | 22 | extern int iSeries_set_rtc_time(struct rtc_time *tm); |
22 | extern void iSeries_get_rtc_time(struct rtc_time *tm); | 23 | extern void iSeries_get_rtc_time(struct rtc_time *tm); |