Merge nuts.davemloft.net:/disk1/BK/sparcwork-2.6

into nuts.davemloft.net:/disk1/BK/sparc-2.6

arch/sparc64/kernel/Makefile

@@ -3,7 +3,7 @@
 #
 
 EXTRA_AFLAGS := -ansi
-# EXTRA_CFLAGS := -Werror
+EXTRA_CFLAGS := -Werror
 
 extra-y		:= head.o init_task.o vmlinux.lds.s
 

arch/sparc64/kernel/binfmt_elf32.c

@@ -151,4 +151,7 @@ MODULE_AUTHOR("Eric Youngdale, David S. Miller, Jakub Jelinek");
 #undef MODULE_DESCRIPTION
 #undef MODULE_AUTHOR
 
+#undef TASK_SIZE
+#define TASK_SIZE 0xf0000000
+
 #include "../../../fs/binfmt_elf.c"

include/asm-sparc64/system.h

@@ -205,7 +205,7 @@ do {	if (test_thread_flag(TIF_PERFCTR)) {				\
 	"ldx	[%%g6 + %7], %%g4\n\t"					\
 	"wrpr	%%g0, 0x96, %%pstate\n\t"				\
 	"andcc	%%o7, %6, %%g0\n\t"					\
-	"beq,pn %%icc, 1f\n\t"						\
+	"beq,pt %%icc, 1f\n\t"						\
 	" mov	%%g5, %0\n\t"						\
 	"b,a ret_from_syscall\n\t"					\
 	"1:\n\t"							\