Merge branch 'linus' into perfcounters/core

Conflicts:
	fs/exec.c
	include/linux/init_task.h

Simple context conflicts.

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/powerpc/include/asm/local.h b/arch/powerpc/include/asm/local.h
index 612d83276653..84b457a3c1bc 100644
--- a/arch/powerpc/include/asm/local.h
+++ b/arch/powerpc/include/asm/local.h
@@ -67,7 +67,7 @@ static __inline__ long local_inc_return(local_t *l)
         bne-    1b"
         : "=&r" (t)
         : "r" (&(l->a.counter))
-        : "cc", "memory");
+        : "cc", "xer", "memory");
 
         return t;
 }
@@ -94,7 +94,7 @@ static __inline__ long local_dec_return(local_t *l)
         bne-    1b"
         : "=&r" (t)
         : "r" (&(l->a.counter))
-        : "cc", "memory");
+        : "cc", "xer", "memory");
 
         return t;
 }