Merge nuts.ninka.net:/home/davem/src/BK/sparcwork-2.5

into nuts.ninka.net:/home/davem/src/BK/sparc-2.5

arch/sparc64/kernel/sys_sparc32.c

@@ -4336,7 +4336,7 @@ asmlinkage int sys32_sched_getaffinity(__kernel_pid_t32 pid, unsigned int len,
 				    &kernel_mask);
 	set_fs(old_fs);
 
-	if (ret == 0) {
+	if (ret > 0) {
 		if (put_user(kernel_mask, user_mask_ptr))
 			ret = -EFAULT;
 	}

include/asm-sparc/elf.h

@@ -9,6 +9,7 @@
 #include <linux/config.h>
 #include <asm/ptrace.h>
 #include <asm/mbus.h>
+#include <asm/uaccess.h>
 
 /* For the most part we present code dumps in the format
  * Solaris does.