* [PATCH] kvm-kmod: Fix condition for native_read_msr_safe wrapping
@ 2009-06-25 8:24 Jan Kiszka
2009-06-25 10:48 ` Avi Kivity
0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2009-06-25 8:24 UTC (permalink / raw)
To: Avi Kivity; +Cc: kvm-devel
For i386, native_read_msr_safe was already introduced in 2.6.22.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
x86/external-module-compat.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/x86/external-module-compat.h b/x86/external-module-compat.h
index 881602e..8436e43 100644
--- a/x86/external-module-compat.h
+++ b/x86/external-module-compat.h
@@ -72,6 +72,8 @@ typedef u64 phys_addr_t;
#define _ASM_ALIGN __ASM_SEL(.balign 4, .balign 8)
#endif
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) || defined(CONFIG_X86_64)
+
static inline unsigned long long native_read_msr_safe(unsigned int msr,
int *err)
{
@@ -90,6 +92,8 @@ static inline unsigned long long native_read_msr_safe(unsigned int msr,
#endif
+#endif
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26)
static inline int rdmsrl_safe(unsigned msr, unsigned long long *p)
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] kvm-kmod: Fix condition for native_read_msr_safe wrapping
2009-06-25 8:24 [PATCH] kvm-kmod: Fix condition for native_read_msr_safe wrapping Jan Kiszka
@ 2009-06-25 10:48 ` Avi Kivity
0 siblings, 0 replies; 2+ messages in thread
From: Avi Kivity @ 2009-06-25 10:48 UTC (permalink / raw)
To: Jan Kiszka; +Cc: kvm-devel
On 06/25/2009 11:24 AM, Jan Kiszka wrote:
> For i386, native_read_msr_safe was already introduced in 2.6.22.
>
Applied, thanks.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-06-25 10:47 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-25 8:24 [PATCH] kvm-kmod: Fix condition for native_read_msr_safe wrapping Jan Kiszka
2009-06-25 10:48 ` Avi Kivity
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox