diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:01:23 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-08 00:25:16 -0500 |
commit | 19b0bd025d6647549e07becf02b99e5168c17432 (patch) | |
tree | df68927ea17384478519865281ba5cfd29992d71 /arch/powerpc/platforms/cell | |
parent | 2b931fb67e10d6eb99d9928fa3afe83cdeeb7354 (diff) |
powerpc/cell: Use correct types in beat files
Only pass the address of a u64 if that is what the function requires.
[Split out of a larger patch - sfr]
[update comment - sfr]
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/cell')
-rw-r--r-- | arch/powerpc/platforms/cell/beat_htab.c | 21 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/beat_udbg.c | 4 |
2 files changed, 13 insertions, 12 deletions
diff --git a/arch/powerpc/platforms/cell/beat_htab.c b/arch/powerpc/platforms/cell/beat_htab.c index 2e67bd840e01..35b1ec492715 100644 --- a/arch/powerpc/platforms/cell/beat_htab.c +++ b/arch/powerpc/platforms/cell/beat_htab.c | |||
@@ -44,8 +44,8 @@ static DEFINE_SPINLOCK(beat_htab_lock); | |||
44 | 44 | ||
45 | static inline unsigned int beat_read_mask(unsigned hpte_group) | 45 | static inline unsigned int beat_read_mask(unsigned hpte_group) |
46 | { | 46 | { |
47 | unsigned long hpte_v[5]; | ||
48 | unsigned long rmask = 0; | 47 | unsigned long rmask = 0; |
48 | u64 hpte_v[5]; | ||
49 | 49 | ||
50 | beat_read_htab_entries(0, hpte_group + 0, hpte_v); | 50 | beat_read_htab_entries(0, hpte_group + 0, hpte_v); |
51 | if (!(hpte_v[0] & HPTE_V_BOLTED)) | 51 | if (!(hpte_v[0] & HPTE_V_BOLTED)) |
@@ -93,8 +93,7 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group, | |||
93 | int psize, int ssize) | 93 | int psize, int ssize) |
94 | { | 94 | { |
95 | unsigned long lpar_rc; | 95 | unsigned long lpar_rc; |
96 | unsigned long slot; | 96 | u64 hpte_v, hpte_r, slot; |
97 | unsigned long hpte_v, hpte_r; | ||
98 | 97 | ||
99 | /* same as iseries */ | 98 | /* same as iseries */ |
100 | if (vflags & HPTE_V_SECONDARY) | 99 | if (vflags & HPTE_V_SECONDARY) |
@@ -153,8 +152,9 @@ static long beat_lpar_hpte_remove(unsigned long hpte_group) | |||
153 | 152 | ||
154 | static unsigned long beat_lpar_hpte_getword0(unsigned long slot) | 153 | static unsigned long beat_lpar_hpte_getword0(unsigned long slot) |
155 | { | 154 | { |
156 | unsigned long dword0, dword[5]; | 155 | unsigned long dword0; |
157 | unsigned long lpar_rc; | 156 | unsigned long lpar_rc; |
157 | u64 dword[5]; | ||
158 | 158 | ||
159 | lpar_rc = beat_read_htab_entries(0, slot & ~3UL, dword); | 159 | lpar_rc = beat_read_htab_entries(0, slot & ~3UL, dword); |
160 | 160 | ||
@@ -170,7 +170,7 @@ static void beat_lpar_hptab_clear(void) | |||
170 | unsigned long size_bytes = 1UL << ppc64_pft_size; | 170 | unsigned long size_bytes = 1UL << ppc64_pft_size; |
171 | unsigned long hpte_count = size_bytes >> 4; | 171 | unsigned long hpte_count = size_bytes >> 4; |
172 | int i; | 172 | int i; |
173 | unsigned long dummy0, dummy1; | 173 | u64 dummy0, dummy1; |
174 | 174 | ||
175 | /* TODO: Use bulk call */ | 175 | /* TODO: Use bulk call */ |
176 | for (i = 0; i < hpte_count; i++) | 176 | for (i = 0; i < hpte_count; i++) |
@@ -189,7 +189,8 @@ static long beat_lpar_hpte_updatepp(unsigned long slot, | |||
189 | int psize, int ssize, int local) | 189 | int psize, int ssize, int local) |
190 | { | 190 | { |
191 | unsigned long lpar_rc; | 191 | unsigned long lpar_rc; |
192 | unsigned long dummy0, dummy1, want_v; | 192 | u64 dummy0, dummy1; |
193 | unsigned long want_v; | ||
193 | 194 | ||
194 | want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M); | 195 | want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M); |
195 | 196 | ||
@@ -255,7 +256,8 @@ static void beat_lpar_hpte_updateboltedpp(unsigned long newpp, | |||
255 | unsigned long ea, | 256 | unsigned long ea, |
256 | int psize, int ssize) | 257 | int psize, int ssize) |
257 | { | 258 | { |
258 | unsigned long lpar_rc, slot, vsid, va, dummy0, dummy1; | 259 | unsigned long lpar_rc, slot, vsid, va; |
260 | u64 dummy0, dummy1; | ||
259 | 261 | ||
260 | vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M); | 262 | vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M); |
261 | va = (vsid << 28) | (ea & 0x0fffffff); | 263 | va = (vsid << 28) | (ea & 0x0fffffff); |
@@ -276,7 +278,7 @@ static void beat_lpar_hpte_invalidate(unsigned long slot, unsigned long va, | |||
276 | { | 278 | { |
277 | unsigned long want_v; | 279 | unsigned long want_v; |
278 | unsigned long lpar_rc; | 280 | unsigned long lpar_rc; |
279 | unsigned long dummy1, dummy2; | 281 | u64 dummy1, dummy2; |
280 | unsigned long flags; | 282 | unsigned long flags; |
281 | 283 | ||
282 | DBG_LOW(" inval : slot=%lx, va=%016lx, psize: %d, local: %d\n", | 284 | DBG_LOW(" inval : slot=%lx, va=%016lx, psize: %d, local: %d\n", |
@@ -315,8 +317,7 @@ static long beat_lpar_hpte_insert_v3(unsigned long hpte_group, | |||
315 | int psize, int ssize) | 317 | int psize, int ssize) |
316 | { | 318 | { |
317 | unsigned long lpar_rc; | 319 | unsigned long lpar_rc; |
318 | unsigned long slot; | 320 | u64 hpte_v, hpte_r, slot; |
319 | unsigned long hpte_v, hpte_r; | ||
320 | 321 | ||
321 | /* same as iseries */ | 322 | /* same as iseries */ |
322 | if (vflags & HPTE_V_SECONDARY) | 323 | if (vflags & HPTE_V_SECONDARY) |
diff --git a/arch/powerpc/platforms/cell/beat_udbg.c b/arch/powerpc/platforms/cell/beat_udbg.c index 6b418f6b6175..350735bc8888 100644 --- a/arch/powerpc/platforms/cell/beat_udbg.c +++ b/arch/powerpc/platforms/cell/beat_udbg.c | |||
@@ -40,8 +40,8 @@ static void udbg_putc_beat(char c) | |||
40 | } | 40 | } |
41 | 41 | ||
42 | /* Buffered chars getc */ | 42 | /* Buffered chars getc */ |
43 | static long inbuflen; | 43 | static u64 inbuflen; |
44 | static long inbuf[2]; /* must be 2 longs */ | 44 | static u64 inbuf[2]; /* must be 2 u64s */ |
45 | 45 | ||
46 | static int udbg_getc_poll_beat(void) | 46 | static int udbg_getc_poll_beat(void) |
47 | { | 47 | { |