aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/uapi/asm/kvm_para.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-10-19 08:11:36 (GMT)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-10-19 09:07:18 (GMT)
commitfd2c32a95b10f49d3099188d4d825d9a91e9fe05 (patch)
tree1860aeb008ee3f793f2eb786a330437c78bb8713 /arch/s390/include/uapi/asm/kvm_para.h
parentd18f99c28bab882f42949363658da5cf1d2f624f (diff)
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>
Diffstat (limited to 'arch/s390/include/uapi/asm/kvm_para.h')
-rw-r--r--arch/s390/include/uapi/asm/kvm_para.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/s390/include/uapi/asm/kvm_para.h b/arch/s390/include/uapi/asm/kvm_para.h
new file mode 100644
index 0000000..ff1f4e7
--- /dev/null
+++ b/arch/s390/include/uapi/asm/kvm_para.h
@@ -0,0 +1,11 @@
+/*
+ * User API definitions for paravirtual devices on s390
+ *
+ * Copyright IBM Corp. 2008
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License (version 2 only)
+ * as published by the Free Software Foundation.
+ *
+ * Author(s): Christian Borntraeger <borntraeger@de.ibm.com>
+ */

Privacy Policy