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>

diff --git a/arch/powerpc/platforms/cell/beat_htab.c b/arch/powerpc/platforms/cell/beat_htab.c
index 2e67bd840e011f6b10a284441c83ea2ac467dde7..35b1ec492715613becadbfad8680c6f2fc479117 100644 (file)
--- 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);
 
 static inline unsigned int beat_read_mask(unsigned hpte_group)
 {
-       unsigned long hpte_v[5];
        unsigned long rmask = 0;
+       u64 hpte_v[5];
 
        beat_read_htab_entries(0, hpte_group + 0, hpte_v);
        if (!(hpte_v[0] & HPTE_V_BOLTED))
@@ -93,8 +93,7 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group,
                                  int psize, int ssize)
 {
        unsigned long lpar_rc;
-       unsigned long slot;
-       unsigned long hpte_v, hpte_r;
+       u64 hpte_v, hpte_r, slot;
 
        /* same as iseries */
        if (vflags & HPTE_V_SECONDARY)
@@ -153,8 +152,9 @@ static long beat_lpar_hpte_remove(unsigned long hpte_group)
 
 static unsigned long beat_lpar_hpte_getword0(unsigned long slot)
 {
-       unsigned long dword0, dword[5];
+       unsigned long dword0;
        unsigned long lpar_rc;
+       u64 dword[5];
 
        lpar_rc = beat_read_htab_entries(0, slot & ~3UL, dword);
 
@@ -170,7 +170,7 @@ static void beat_lpar_hptab_clear(void)
        unsigned long size_bytes = 1UL << ppc64_pft_size;
        unsigned long hpte_count = size_bytes >> 4;
        int i;
-       unsigned long dummy0, dummy1;
+       u64 dummy0, dummy1;
 
        /* TODO: Use bulk call */
        for (i = 0; i < hpte_count; i++)
@@ -189,7 +189,8 @@ static long beat_lpar_hpte_updatepp(unsigned long slot,
                                    int psize, int ssize, int local)
 {
        unsigned long lpar_rc;
-       unsigned long dummy0, dummy1, want_v;
+       u64 dummy0, dummy1;
+       unsigned long want_v;
 
        want_v = hpte_encode_v(va, psize, MMU_SEGSIZE_256M);
 
@@ -255,7 +256,8 @@ static void beat_lpar_hpte_updateboltedpp(unsigned long newpp,
                                          unsigned long ea,
                                          int psize, int ssize)
 {
-       unsigned long lpar_rc, slot, vsid, va, dummy0, dummy1;
+       unsigned long lpar_rc, slot, vsid, va;
+       u64 dummy0, dummy1;
 
        vsid = get_kernel_vsid(ea, MMU_SEGSIZE_256M);
        va = (vsid << 28) | (ea & 0x0fffffff);
@@ -276,7 +278,7 @@ static void beat_lpar_hpte_invalidate(unsigned long slot, unsigned long va,
 {
        unsigned long want_v;
        unsigned long lpar_rc;
-       unsigned long dummy1, dummy2;
+       u64 dummy1, dummy2;
        unsigned long flags;
 
        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,
                                  int psize, int ssize)
 {
        unsigned long lpar_rc;
-       unsigned long slot;
-       unsigned long hpte_v, hpte_r;
+       u64 hpte_v, hpte_r, slot;
 
        /* same as iseries */
        if (vflags & HPTE_V_SECONDARY)

diff --git a/arch/powerpc/platforms/cell/beat_udbg.c b/arch/powerpc/platforms/cell/beat_udbg.c
index 6b418f6b61750ec6f94e8f4fc89606696f6ab1f9..350735bc88882fe7668d33841e2f354f7773d01b 100644 (file)
--- 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)
 }
 
 /* Buffered chars getc */
-static long inbuflen;
-static long inbuf[2];  /* must be 2 longs */
+static u64 inbuflen;
+static u64 inbuf[2];   /* must be 2 u64s */
 
 static int udbg_getc_poll_beat(void)
 {

diff --git a/drivers/char/hvc_beat.c b/drivers/char/hvc_beat.c
index 91cdb35a920480f384fdff9efad6f28fb572021f..0afc8b82212e78dd17d7d2b254ec099b5642cfb7 100644 (file)
--- a/drivers/char/hvc_beat.c
+++ b/drivers/char/hvc_beat.c
@@ -44,7 +44,7 @@ static int hvc_beat_get_chars(uint32_t vtermno, char *buf, int cnt)
        static unsigned char q[sizeof(unsigned long) * 2]
                __attribute__((aligned(sizeof(unsigned long))));
        static int qlen = 0;
-       unsigned long got;
+       u64 got;
 
 again:
        if (qlen) {
@@ -63,7 +63,7 @@ again:
                }
        }
        if (beat_get_term_char(vtermno, &got,
-               ((unsigned long *)q), ((unsigned long *)q) + 1) == 0) {
+               ((u64 *)q), ((u64 *)q) + 1) == 0) {
                qlen = got;
                goto again;
        }