PPC32: two warning fixes from Rusty Russell, plus fix the PPC603

tlb miss handlers to expect a physical address in the pmds.

arch/ppc/boot/chrp/start.c

 /*
- * BK Id: SCCS/s.start.c 1.8 07/25/01 18:13:07 trini
+ * BK Id: %F% %I% %G% %U% %#%
  */
 /*
  * Copyright (C) Paul Mackerras 1997.
@@ -11,7 +11,7 @@
  */
 #include <stdarg.h>
 
-int (*prom)();
+int (*prom)(void *args);
 
 void *chosen_handle;
 void *stdin;
@@ -30,7 +30,7 @@ extern int strlen(const char *s);
 void
 start(int a1, int a2, void *promptr)
 {
-    prom = (int (*)()) promptr;
+    prom = promptr;
     chosen_handle = finddevice("/chosen");
     if (chosen_handle == (void *) -1)
 	exit();
@@ -65,7 +65,7 @@ write(void *handle, void *ptr, int nb)
     args.addr = ptr;
     args.len = nb;
     args.actual = -1;
-    (*prom)(&args);
+    prom(&args);
     return args.actual;
 }
 
@@ -211,7 +211,7 @@ fputs(char *str, void *f)
 }
 
 int
-readchar()
+readchar(void)
 {
     char ch;
 

arch/ppc/kernel/head.S

@@ -507,7 +507,6 @@ InstructionTLBMiss:
 	lwz	r2,0(r2)		/* get pmd entry */
 	rlwinm.	r2,r2,0,0,19		/* extract address of pte page */
 	beq-	InstructionAddressInvalid	/* return if no mapping */
-	tophys(r2,r2)
 	rlwimi	r2,r3,22,20,29		/* insert next 10 bits of address */
 	lwz	r3,0(r2)		/* get linux-style pte */
 	andc.	r1,r1,r3		/* check access & ~permission */
@@ -582,7 +581,6 @@ DataLoadTLBMiss:
 	lwz	r2,0(r2)		/* get pmd entry */
 	rlwinm.	r2,r2,0,0,19		/* extract address of pte page */
 	beq-	DataAddressInvalid	/* return if no mapping */
-	tophys(r2,r2)
 	rlwimi	r2,r3,22,20,29		/* insert next 10 bits of address */
 	lwz	r3,0(r2)		/* get linux-style pte */
 	andc.	r1,r1,r3		/* check access & ~permission */
@@ -655,7 +653,6 @@ DataStoreTLBMiss:
 	lwz	r2,0(r2)		/* get pmd entry */
 	rlwinm.	r2,r2,0,0,19		/* extract address of pte page */
 	beq-	DataAddressInvalid	/* return if no mapping */
-	tophys(r2,r2)
 	rlwimi	r2,r3,22,20,29		/* insert next 10 bits of address */
 	lwz	r3,0(r2)		/* get linux-style pte */
 	andc.	r1,r1,r3		/* check access & ~permission */

include/asm-ppc/spinlock.h

@@ -65,7 +65,7 @@ static inline void _raw_spin_unlock(spinlock_t *lock)
 	lock->lock = 0;
 }
 
-#define _raw_spin_trylock(lock) (!test_and_set_bit(0,(lock)))
+#define _raw_spin_trylock(l) (!test_and_set_bit(0,&(l)->lock))
 
 #else