1
0
Fork 0
alistair23-linux/arch/ia64
David Howells 7e3cdf242f 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>
2012-10-18 17:27:43 -07:00
..
configs [IA64] defconfig: Remove CONFIG_MISC_DEVICES 2012-08-20 13:04:29 -07:00
dig Disintegrate asm/system.h for IA64 2012-03-28 18:30:02 +01:00
hp TTY: use tty_port_link_device 2012-08-13 16:50:19 -07:00
include UAPI: Make arch/ia64/include/asm/kvm_para.h generic 2012-10-18 17:27:43 -07:00
kernel Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 2012-10-13 10:04:42 +09:00
kvm KVM: split kvm_arch_flush_shadow 2012-09-06 16:37:25 +03:00
lib
mm mm: fix-up zone present pages 2012-10-09 16:22:54 +09:00
oprofile Disintegrate asm/system.h for IA64 2012-03-28 18:30:02 +01:00
pci Merge branch 'pci/yinghai-misc' into next 2012-09-24 17:24:11 -06:00
scripts
sn ia64/PCI: Use hotplug-safe pci_get_domain_bus_and_slot() 2012-09-12 14:10:33 -06:00
uv
xen sections: fix section conflicts in arch/ia64 2012-10-06 03:04:39 +09:00
Kconfig Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux 2012-10-14 13:39:34 -07:00
Kconfig.debug
Makefile
install.sh
module.lds