aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/cpu.h
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2009-09-11 10:29:04 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-09-11 10:29:56 +0200
commite86a6ed63f46fe8fb555fda531084bca3ef62fd7 (patch)
tree8024574e6ac2bf6a9bb505e64e4c73d639578088 /arch/s390/include/asm/cpu.h
parent4bb5e07b68565d7983108993aa23eccf5f1b35fe (diff)
[S390] Get rid of cpuid.h header file.
Merge cpuid.h header file into cpu.h. While at it convert from typedef to struct declaration and also convert cio code to use proper lowcore structure instead of casts. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> 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.h20
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/s390/include/asm/cpu.h b/arch/s390/include/asm/cpu.h
index 702ad46841cf..471234b90574 100644
--- a/arch/s390/include/asm/cpu.h
+++ b/arch/s390/include/asm/cpu.h
@@ -1,6 +1,26 @@
+/*
+ * 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
#define MAX_CPU_ADDRESS 255
+#ifndef __ASSEMBLY__
+
+#include <linux/types.h>
+
+struct cpuid
+{
+ unsigned int version : 8;
+ unsigned int ident : 24;
+ unsigned int machine : 16;
+ unsigned int unused : 16;
+} __packed;
+
+#endif /* __ASSEMBLY__ */
#endif /* _ASM_S390_CPU_H */

Privacy Policy