From: Jan Blunck <jblunck@suse.de>
Date: Mon, 6 Mar 2006 23:42:46 +0000 (-0800)
Subject: [PATCH] s390: fix compile with VIRT_CPU_ACCOUNTING=n
X-Git-Tag: v2.6.16-rc6~100
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c8338904653365bfb92385b38915becb903d8bb;p=linux-2.6

[PATCH] s390: fix compile with VIRT_CPU_ACCOUNTING=n

When CONFIG_VIRT_CPU_ACCOUNTING is not defined compiling fails with an
undefined reference to account_vtime().

Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h
index b2e65e8bf8..6a89dbb03c 100644
--- a/include/asm-s390/system.h
+++ b/include/asm-s390/system.h
@@ -118,6 +118,8 @@ static inline void sched_cacheflush(void)
 extern void account_vtime(struct task_struct *);
 extern void account_tick_vtime(struct task_struct *);
 extern void account_system_vtime(struct task_struct *);
+#else
+#define account_vtime(x) do { /* empty */ } while (0)
 #endif
 
 #define finish_arch_switch(prev) do {					     \