diff --git a/[refs] b/[refs]
index e60bb40cd6fe..fba56bd6172a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bca0fb8683b7406d3056dc53a14b0a482c367e2b
+refs/heads/master: dc74d7f996b465d8a95033c753d34c8b4c01c9d7
diff --git a/trunk/include/asm-s390/processor.h b/trunk/include/asm-s390/processor.h
index e0fcea8c64c3..5cb480af65d5 100644
--- a/trunk/include/asm-s390/processor.h
+++ b/trunk/include/asm-s390/processor.h
@@ -216,6 +216,11 @@ static inline void cpu_relax(void)
 	barrier();
 }
 
+static inline void psw_set_key(unsigned int key)
+{
+	asm volatile("spka 0(%0)" : : "d" (key));
+}
+
 /*
  * Set PSW to specified value.
  */
diff --git a/trunk/include/asm-s390/ptrace.h b/trunk/include/asm-s390/ptrace.h
index fa6ca87080e8..332ee73688fc 100644
--- a/trunk/include/asm-s390/ptrace.h
+++ b/trunk/include/asm-s390/ptrace.h
@@ -470,14 +470,7 @@ struct user_regs_struct
 #define regs_return_value(regs)((regs)->gprs[2])
 #define profile_pc(regs) instruction_pointer(regs)
 extern void show_regs(struct pt_regs * regs);
-#endif
-
-static inline void
-psw_set_key(unsigned int key)
-{
-	asm volatile("spka 0(%0)" : : "d" (key));
-}
-
+#endif /* __KERNEL__ */
 #endif /* __ASSEMBLY__ */
 
 #endif /* _S390_PTRACE_H */