linux-kernel - [PATCH] UAPI: S390 shouldn't've been changed to use uapi/asm-generic/kvm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20121018175813.7489.19089.stgit@warthog.procyon.org.uk>
Date:	Thu, 18 Oct 2012 18:58:13 +0100
From:	David Howells <dhowells@...hat.com>
To:	schwidefsky@...ibm.com, heiko.carstens@...ibm.com
Cc:	linux-s390@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Howells <dhowells@...hat.com>,
	Yuanhan Liu <yuanhan.liu@...el.com>, fengguang.wu@...el.com
Subject: [PATCH] UAPI: S390 shouldn't've been changed to 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.

Reported-by: Yuanhan Liu <yuanhan.liu@...el.com>
Signed-off-by: David Howells <dhowells@...hat.com>
cc: Yuanhan Liu <yuanhan.liu@...el.com>
cc: fengguang.wu@...el.com
---

 arch/s390/include/uapi/asm/Kbuild     |    2 --
 arch/s390/include/uapi/asm/kvm_para.h |   11 +++++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 arch/s390/include/uapi/asm/kvm_para.h

diff --git a/arch/s390/include/uapi/asm/Kbuild b/arch/s390/include/uapi/asm/Kbuild
index 59b67ed..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
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@...ibm.com>
+ */

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/