summaryrefslogtreecommitdiff
path: root/arch/s390/include/asm/cpu.h
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2009-06-12 12:26:21 +0400
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-06-12 12:27:29 +0400
commit76d4e00a05d06c1d1552adea24fcf6182c9d8999 (patch)
tree932881ed89489a912fc4c3ab15b03290283d60e2 /arch/s390/include/asm/cpu.h
parent7aa79f948749da7de3de0c427e9c9ee0ff595243 (diff)
downloadlinux-76d4e00a05d06c1d1552adea24fcf6182c9d8999.tar.xz
[S390] merge cpu.h into cputime.h
All definition in cpu.h have to do with cputime accounting. Move them to cputime.h and remove the header file. Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/cpu.h')
-rw-r--r--arch/s390/include/asm/cpu.h32
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/s390/include/asm/cpu.h b/arch/s390/include/asm/cpu.h
deleted file mode 100644
index d60a2eefb17b..000000000000
--- a/arch/s390/include/asm/cpu.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * include/asm-s390/cpu.h
- *
- * Copyright IBM Corp. 2007
- * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com>
- */
-
-#ifndef _ASM_S390_CPU_H_
-#define _ASM_S390_CPU_H_
-
-#include <linux/types.h>
-#include <linux/percpu.h>
-#include <linux/spinlock.h>
-
-struct s390_idle_data {
- spinlock_t lock;
- unsigned long long idle_count;
- unsigned long long idle_enter;
- unsigned long long idle_time;
-};
-
-DECLARE_PER_CPU(struct s390_idle_data, s390_idle);
-
-void vtime_start_cpu(void);
-
-static inline void s390_idle_check(void)
-{
- if ((&__get_cpu_var(s390_idle))->idle_enter != 0ULL)
- vtime_start_cpu();
-}
-
-#endif /* _ASM_S390_CPU_H_ */