diff --git a/[refs] b/[refs]
index 0fc269c913e4..e910f2092928 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb05bfe4fbf031f95e392204efaa4da71c75b2e2
+refs/heads/master: 5ee24d9594ffb070261b70461f71c42913c663bb
diff --git a/trunk/include/asm-s390/system.h b/trunk/include/asm-s390/system.h
index b4a9f05a93d6..864cae7e1fd6 100644
--- a/trunk/include/asm-s390/system.h
+++ b/trunk/include/asm-s390/system.h
@@ -107,11 +107,9 @@ static inline void restore_access_regs(unsigned int *acrs)
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
 extern void account_user_vtime(struct task_struct *);
 extern void account_system_vtime(struct task_struct *);
-#else
-#define account_system_vtime(prev) do { } while (0)
 #endif
 
-#define finish_arch_switch(rq, prev) do {				     \
+#define finish_arch_switch(prev) do {					     \
 	set_fs(current->thread.mm_segment);				     \
 	account_system_vtime(prev);					     \
 } while (0)