summaryrefslogtreecommitdiffstats
path: root/arch/s390/include/asm/chpid.h
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2012-10-09 09:47:31 +0100
committerDavid Howells <dhowells@redhat.com>2012-10-09 09:47:31 +0100
commit9807f75955ea7f1877981056755284481873115c (patch)
tree1e80f10ee622a1638d4b0835030d0d69b0492c55 /arch/s390/include/asm/chpid.h
parent9e2d8656f5e8aa214e66b462680cf86b210b74a8 (diff)
downloadop-kernel-dev-9807f75955ea7f1877981056755284481873115c.zip
op-kernel-dev-9807f75955ea7f1877981056755284481873115c.tar.gz
UAPI: (Scripted) Disintegrate arch/s390/include/asm
Signed-off-by: David Howells <dhowells@redhat.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Michael Kerrisk <mtk.manpages@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Acked-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/s390/include/asm/chpid.h')
-rw-r--r--arch/s390/include/asm/chpid.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/s390/include/asm/chpid.h b/arch/s390/include/asm/chpid.h
index e5bde9f..64c76dd 100644
--- a/arch/s390/include/asm/chpid.h
+++ b/arch/s390/include/asm/chpid.h
@@ -2,23 +2,10 @@
* Copyright IBM Corp. 2007
* Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
*/
-
#ifndef _ASM_S390_CHPID_H
#define _ASM_S390_CHPID_H
-#include <linux/string.h>
-#include <linux/types.h>
-
-#define __MAX_CHPID 255
-
-struct chp_id {
- u8 reserved1;
- u8 cssid;
- u8 reserved2;
- u8 id;
-} __attribute__((packed));
-
-#ifdef __KERNEL__
+#include <uapi/asm/chpid.h>
#include <asm/cio.h>
static inline void chp_id_init(struct chp_id *chpid)
@@ -49,6 +36,4 @@ static inline int chp_id_is_valid(struct chp_id *chpid)
#define chp_id_for_each(c) \
for (chp_id_init(c); chp_id_is_valid(c); chp_id_next(c))
-#endif /* __KERNEL */
-
#endif /* _ASM_S390_CHPID_H */
OpenPOWER on IntegriCloud