aboutsummaryrefslogtreecommitdiffstats
path: root/arch/s390/include/uapi/asm/Kbuild
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/Kbuild
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/Kbuild')
-rw-r--r--arch/s390/include/uapi/asm/Kbuild2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild
index 59b67ed4..7bf68ff 100644
--- a/arch/s390/include/uapi/asm/Kbuild
+++ b/arch/s390/include/uapi/asm/Kbuild
@@ -1,8 +1,6 @@
# UAPI Header export list
include include/uapi/asm-generic/Kbuild.asm
-generic-y += kvm_para.h
-
header-y += auxvec.h
header-y += bitsperlong.h
header-y += byteorder.h

Privacy Policy