diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-18 17:58:12 +0100 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2012-10-18 17:27:43 -0700 |
| commit | 7e3cdf242f6dfa8d66dac8e1a5167f3e3101d213 (patch) | |
| tree | 3647812a82adad49f7aee8e0640bb9ce62c66960 /arch/ia64/include | |
| parent | c9623de4fc2f8320fe94316b46171683be3b1d59 (diff) | |
| download | linux-3.10-7e3cdf242f6dfa8d66dac8e1a5167f3e3101d213.tar.gz linux-3.10-7e3cdf242f6dfa8d66dac8e1a5167f3e3101d213.tar.bz2 linux-3.10-7e3cdf242f6dfa8d66dac8e1a5167f3e3101d213.zip | |
UAPI: Make arch/ia64/include/asm/kvm_para.h generic
Make arch/ia64/include/asm/kvm_para.h generic since it's the same as the
asm-generic version. This deals with the problem when ia64 is compiled with
allmodconfig you get:
In file included from include/uapi/linux/kvm_para.h:26:0,
from include/linux/kvm_para.h:4,
from kernel/watchdog.c:28:
arch/ia64/include/asm/kvm_para.h:24:28: error: redefinition of 'kvm_arch_para_features'
include/asm-generic/kvm_para.h:16:28: note: previous definition of 'kvm_arch_para_features' was here
arch/ia64/include/asm/kvm_para.h:29:20: error: redefinition of 'kvm_check_and_clear_guest_paused'
include/asm-generic/kvm_para.h:11:20: note: previous definition of 'kvm_check_and_clear_guest_paused' was here
This does not happen for ia64 defconfig.
Reported-by: Yuanhan Liu <yuanhan.liu@intel.com>
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Yuanhan Liu <yuanhan.liu@intel.com>
cc: fengguang.wu@intel.com
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/include')
| -rw-r--r-- | arch/ia64/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/ia64/include/asm/kvm_para.h | 34 |
2 files changed, 1 insertions, 34 deletions
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild index 4a159da2363..dd02f09b6ed 100644 --- a/arch/ia64/include/asm/Kbuild +++ b/arch/ia64/include/asm/Kbuild @@ -1,3 +1,4 @@ generic-y += clkdev.h generic-y += exec.h +generic-y += kvm_para.h diff --git a/arch/ia64/include/asm/kvm_para.h b/arch/ia64/include/asm/kvm_para.h deleted file mode 100644 index 47c00f91043..00000000000 --- a/arch/ia64/include/asm/kvm_para.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com> - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., 59 Temple - * Place - Suite 330, Boston, MA 02111-1307 USA. - * - */ -#ifndef __IA64_KVM_PARA_H -#define __IA64_KVM_PARA_H - -#include <uapi/asm/kvm_para.h> - - -static inline unsigned int kvm_arch_para_features(void) -{ - return 0; -} - -static inline bool kvm_check_and_clear_guest_paused(void) -{ - return false; -} - -#endif |