diff options
| author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2009-09-11 10:29:04 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-09-11 10:29:56 +0200 |
| commit | e86a6ed63f46fe8fb555fda531084bca3ef62fd7 (patch) | |
| tree | 8024574e6ac2bf6a9bb505e64e4c73d639578088 /arch/s390/include/asm/processor.h | |
| parent | 4bb5e07b68565d7983108993aa23eccf5f1b35fe (diff) | |
| download | kernel_samsung_smdk4412-e86a6ed63f46fe8fb555fda531084bca3ef62fd7.zip kernel_samsung_smdk4412-e86a6ed63f46fe8fb555fda531084bca3ef62fd7.tar.gz kernel_samsung_smdk4412-e86a6ed63f46fe8fb555fda531084bca3ef62fd7.tar.bz2 | |
[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/processor.h')
| -rw-r--r-- | arch/s390/include/asm/processor.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h index c139fa7..cf8eed3 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h @@ -14,7 +14,7 @@ #define __ASM_S390_PROCESSOR_H #include <linux/linkage.h> -#include <asm/cpuid.h> +#include <asm/cpu.h> #include <asm/page.h> #include <asm/ptrace.h> #include <asm/setup.h> @@ -26,7 +26,7 @@ */ #define current_text_addr() ({ void *pc; asm("basr %0,0" : "=a" (pc)); pc; }) -static inline void get_cpu_id(cpuid_t *ptr) +static inline void get_cpu_id(struct cpuid *ptr) { asm volatile("stidp 0(%1)" : "=m" (*ptr) : "a" (ptr)); } |