David Howells fd2c32a95b 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 0420c87e64, 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>		2012-10-19 11:07:18 +02:00
..
asm	perf_cpum_cf: Add support for counters available with IBM zEC12	2012-10-18 17:50:09 +02:00
uapi/asm	s390,uapi: do not use uapi/asm-generic/kvm_para.h	2012-10-19 11:07:18 +02:00