PPC32: Cleanups from Christoph Hellwig and Tom Rini.

arch/ppc/mm/pgtable.c

@@ -74,7 +74,6 @@ pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
 	pte_t *pte;
 	extern int mem_init_done;
 	extern void *early_get_page(void);
-	int timeout = 0;
 
 	if (mem_init_done)
 		pte = (pte_t *)__get_free_page(GFP_KERNEL|__GFP_REPEAT);

include/asm-ppc/system.h

@@ -5,7 +5,7 @@
 #define __PPC_SYSTEM_H
 
 #include <linux/config.h>
-#include <linux/kdev_t.h>
+#include <linux/kernel.h>
 
 #include <asm/processor.h>
 #include <asm/atomic.h>
@@ -43,9 +43,9 @@
 #define smp_wmb()	wmb()
 #define smp_read_barrier_depends()	read_barrier_depends()
 #else
-#define smp_mb()	__asm__ __volatile__("": : :"memory")
-#define smp_rmb()	__asm__ __volatile__("": : :"memory")
-#define smp_wmb()	__asm__ __volatile__("": : :"memory")
+#define smp_mb()	barrier()
+#define smp_rmb()	barrier()
+#define smp_wmb()	barrier()
 #define smp_read_barrier_depends()	do { } while(0)
 #endif /* CONFIG_SMP */