s390,uapi: do not use uapi/asm-generic/kvm_para.h
authorDavid Howells <dhowells@redhat.com>
Fri, 19 Oct 2012 08:11:36 +0000 (10:11 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Fri, 19 Oct 2012 09:07:18 +0000 (11:07 +0200)
commitfd2c32a95b10f49d3099188d4d825d9a91e9fe05
tree1860aeb008ee3f793f2eb786a330437c78bb8713
parentd18f99c28bab882f42949363658da5cf1d2f624f
s390,uapi: do not use uapi/asm-generic/kvm_para.h

It turns out that S390 shouldn't use uapi/asm-generic/kvm_para.h since it
defines the functions in its non-UAPI kvm_para.h file.

#including <asm-generic/kvm_para.h> will first pick up
include/asm-generic/kvm_para.h, which defines conflicting functions.

Instead, partially revert commit 0420c87e648a3b623ad925038a0bcff2ef5a4bc9,
ungenericising this file and just inserting a comment to prevent the patch
program from deleting it.

cc: Yuanhan Liu <yuanhan.liu@intel.com>
cc: fengguang.wu@intel.com
Reported-by: Yuanhan Liu <yuanhan.liu@intel.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/include/uapi/asm/Kbuild
arch/s390/include/uapi/asm/kvm_para.h [new file with mode: 0644]