Commit fd2c32a9 authored Oct 19, 2012 by David Howells Committed by Martin Schwidefsky Oct 19, 2012

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 0420c87e,
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>

parent d18f99c2

arch/s390/include/uapi/asm/Kbuild

+0 −2

Original line number	Diff line number	Diff line
		# 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

arch/s390/include/uapi/asm/kvm_para.h

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		/*
		* 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>
		*/