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/kvm_host.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/kvm_host.h')
| -rw-r--r-- | arch/s390/include/asm/kvm_host.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h index 1cd02f6..698988f 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -17,7 +17,7 @@ #include <linux/interrupt.h> #include <linux/kvm_host.h> #include <asm/debug.h> -#include <asm/cpuid.h> +#include <asm/cpu.h> #define KVM_MAX_VCPUS 64 #define KVM_MEMORY_SLOTS 32 @@ -217,8 +217,8 @@ struct kvm_vcpu_arch { struct hrtimer ckc_timer; struct tasklet_struct tasklet; union { - cpuid_t cpu_id; - u64 stidp_data; + struct cpuid cpu_id; + u64 stidp_data; }; }; |