git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-kbuild-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
s390
/
include
/
asm
/
kvm_host.h
diff --git
a/arch/s390/include/asm/kvm_host.h
b/arch/s390/include/asm/kvm_host.h
index
1cd02f6
..
698988f
100644
(file)
--- 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 <linux/interrupt.h>
#include <linux/kvm_host.h>
#include <asm/debug.h>
-#include <asm/cpu
id
.h>
+#include <asm/cpu.h>
#define KVM_MAX_VCPUS 64
#define KVM_MEMORY_SLOTS 32
#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 {
struct hrtimer ckc_timer;
struct tasklet_struct tasklet;
union {
-
cpuid_t
cpu_id;
- u64 stidp_data;
+
struct cpuid
cpu_id;
+ u64
stidp_data;
};
};
};
};