diff options
Diffstat (limited to 'arch/s390/include/asm/cpu.h')
| -rw-r--r-- | arch/s390/include/asm/cpu.h | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/arch/s390/include/asm/cpu.h b/arch/s390/include/asm/cpu.h index d60a2eefb17..471234b9057 100644 --- a/arch/s390/include/asm/cpu.h +++ b/arch/s390/include/asm/cpu.h @@ -1,32 +1,26 @@ /* - * include/asm-s390/cpu.h - * - * Copyright IBM Corp. 2007 - * Author(s): Heiko Carstens <heiko.carstens@de.ibm.com> + * Copyright IBM Corp. 2000,2009 + * Author(s): Hartmut Penner <hp@de.ibm.com>, + * Martin Schwidefsky <schwidefsky@de.ibm.com>, + * Christian Ehrhardt <ehrhardt@de.ibm.com>, */ -#ifndef _ASM_S390_CPU_H_ -#define _ASM_S390_CPU_H_ +#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; -}; +#define MAX_CPU_ADDRESS 255 -DECLARE_PER_CPU(struct s390_idle_data, s390_idle); +#ifndef __ASSEMBLY__ -void vtime_start_cpu(void); +#include <linux/types.h> -static inline void s390_idle_check(void) +struct cpuid { - if ((&__get_cpu_var(s390_idle))->idle_enter != 0ULL) - vtime_start_cpu(); -} + unsigned int version : 8; + unsigned int ident : 24; + unsigned int machine : 16; + unsigned int unused : 16; +} __packed; -#endif /* _ASM_S390_CPU_H_ */ +#endif /* __ASSEMBLY__ */ +#endif /* _ASM_S390_CPU_H */ |