summaryrefslogtreecommitdiffstats
path: root/include/asm-s390/system.h
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2006-03-07 21:47:30 +0000
committerSteve French <sfrench@us.ibm.com>2006-03-07 21:47:30 +0000
commitf6e77c94796edad172602234826a022d463d910e (patch)
treef5cb0848c9e848499b0f0676fafe7ff207538ae8 /include/asm-s390/system.h
parentbeb84dc8186662b17d5ea510fabb85cb7e266d33 (diff)
parentd0b004840bd3b5ff2f2a0ad14fa0bd43349f5175 (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/asm-s390/system.h')
-rw-r--r--include/asm-s390/system.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-s390/system.h b/include/asm-s390/system.h
index b2e65e8bf81..6a89dbb03c1 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 { \