]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite771b41f6260b059e4327fd0fbf1a4b0fe661cc5
tree1860aeb008ee3f793f2eb786a330437c78bb8713
parent2b0c77f66bd83ef8772495203d0cc6b1ca82375c
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 4b9d6cb88bdcb3b35f028ed62aea1a7ee56dd983,
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]