diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 01:38:34 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 01:38:34 (GMT) |
| commit | 0c4a479bdf7c0cf3fa1610b25e0c4ddd5b58713e (patch) | |
| tree | 4d1f97d241b692ad8f7aeca9c5b773fbabfae258 /arch/ia64/include/asm/kvm_para.h | |
| parent | ade0899b298ba2c43bfd6abd8cbc2545944cde0c (diff) | |
| parent | d536e0db2433686238ec97c517e4fc691000ee6f (diff) | |
| download | linux-fsl-qoriq-0c4a479bdf7c0cf3fa1610b25e0c4ddd5b58713e.tar.xz | |
Merge tag 'please-pull-dhowells-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 UAPI changes from Tony Luck:
"ia64 pieces of David Howells great UAPI include file move"
* tag 'please-pull-dhowells-uapi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
UAPI: (Scripted) Disintegrate arch/ia64/include/asm
Diffstat (limited to 'arch/ia64/include/asm/kvm_para.h')
| -rw-r--r-- | arch/ia64/include/asm/kvm_para.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/ia64/include/asm/kvm_para.h b/arch/ia64/include/asm/kvm_para.h index 2019cb9..47c00f9 100644 --- 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> * @@ -18,8 +15,11 @@ * 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) { @@ -32,5 +32,3 @@ static inline bool kvm_check_and_clear_guest_paused(void) } #endif - -#endif |