UAPI: Make arch/ia64/include/asm/kvm_para.h generic
authorDavid Howells <dhowells@redhat.com>
Thu, 18 Oct 2012 16:58:12 +0000 (17:58 +0100)
committerTony Luck <tony.luck@intel.com>
Fri, 19 Oct 2012 00:27:43 +0000 (17:27 -0700)
commit7e3cdf242f6dfa8d66dac8e1a5167f3e3101d213
tree3647812a82adad49f7aee8e0640bb9ce62c66960
parentc9623de4fc2f8320fe94316b46171683be3b1d59
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>
arch/ia64/include/asm/Kbuild
arch/ia64/include/asm/kvm_para.h [deleted file]