Skip to content

Commit

Permalink
UAPI: Make arch/ia64/include/asm/kvm_para.h generic
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Howells authored and Tony Luck committed Oct 19, 2012
1 parent c9623de commit 7e3cdf2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 34 deletions.
1 change: 1 addition & 0 deletions arch/ia64/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

generic-y += clkdev.h
generic-y += exec.h
generic-y += kvm_para.h
34 changes: 0 additions & 34 deletions arch/ia64/include/asm/kvm_para.h

This file was deleted.

0 comments on commit 7e3cdf2

Please sign in to comment.