git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bcma: add more package IDs
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
include
/
asm
/
kvm_para.h
diff --git
a/arch/ia64/include/asm/kvm_para.h
b/arch/ia64/include/asm/kvm_para.h
index 2019cb99335e2d5da84546cd977d2a46f92d4340..47c00f910434f2791c279e5866987286d4d8aefa 100644
(file)
--- a/
arch/ia64/include/asm/kvm_para.h
+++ b/
arch/ia64/include/asm/kvm_para.h
@@
-1,6
+1,3
@@
-#ifndef __IA64_KVM_PARA_H
-#define __IA64_KVM_PARA_H
-
/*
* Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
*
/*
* Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
*
@@
-18,8
+15,11
@@
* Place - Suite 330, Boston, MA 02111-1307 USA.
*
*/
* Place - Suite 330, Boston, MA 02111-1307 USA.
*
*/
+#ifndef __IA64_KVM_PARA_H
+#define __IA64_KVM_PARA_H
+
+#include <uapi/asm/kvm_para.h>
-#ifdef __KERNEL__
static inline unsigned int kvm_arch_para_features(void)
{
static inline unsigned int kvm_arch_para_features(void)
{
@@
-32,5
+32,3
@@
static inline bool kvm_check_and_clear_guest_paused(void)
}
#endif
}
#endif
-
-#endif