Merge master.kernel.org:/home/davem/BK/sparc-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux

arch/sparc64/kernel/binfmt_elf32.c

@@ -43,7 +43,7 @@ do {	unsigned int *dest = &(__elf_regs[0]);		\
 	dest[34] = (unsigned int) src->tnpc;		\
 	dest[35] = src->y;				\
 	dest[36] = dest[37] = 0; /* XXX */		\
-} while(0)
+} while(0);
 
 typedef struct {
 	union {

arch/sparc64/kernel/process.c

@@ -424,10 +424,10 @@ void flush_thread(void)
 	struct thread_info *t = current_thread_info();
 
 	if (t->task->mm) {
+		unsigned long pgd_cache = 0UL;
 		if (test_thread_flag(TIF_32BIT)) {
 			struct mm_struct *mm = t->task->mm;
 			pgd_t *pgd0 = &mm->pgd[0];
-			unsigned long pgd_cache;
 
 			if (pgd_none(*pgd0)) {
 				pmd_t *page = pmd_alloc_one_fast(NULL, 0);
@@ -436,13 +436,13 @@ void flush_thread(void)
 				pgd_set(pgd0, page);
 			}
 			pgd_cache = pgd_val(*pgd0) << 11UL;
-			__asm__ __volatile__("stxa %0, [%1] %2\n\t"
-					     "membar #Sync"
-					     : /* no outputs */
-					     : "r" (pgd_cache),
-					       "r" (TSB_REG),
-					       "i" (ASI_DMMU));
 		}
+		__asm__ __volatile__("stxa %0, [%1] %2\n\t"
+				     "membar #Sync"
+				     : /* no outputs */
+				     : "r" (pgd_cache),
+				     "r" (TSB_REG),
+				     "i" (ASI_DMMU));
 	}
 	set_thread_wsaved(0);
 

arch/sparc64/kernel/semaphore.c

@@ -7,6 +7,7 @@
  */
 
 #include <linux/sched.h>
+#include <linux/errno.h>
 
 /*
  * Atomically update sem->count.

arch/sparc64/math-emu/math.c

@@ -10,6 +10,7 @@
 
 #include <linux/types.h>
 #include <linux/sched.h>
+#include <linux/errno.h>
 
 #include <asm/fpumacro.h>
 #include <asm/ptrace.h>

include/asm-sparc64/pgtable.h

@@ -48,6 +48,8 @@ extern void flush_cache_range(struct vm_area_struct *, unsigned long, unsigned l
 	flush_cache_mm((vma)->vm_mm)
 
 
+struct page;
+
 /* 
  * On spitfire, the icache doesn't snoop local stores and we don't
  * use block commit stores (which invalidate icache lines) during