summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2012-10-11 09:54:56 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2012-10-18 17:50:07 +0200
commit4e860696e050375ae7fbb06984c19e2bf6a322e0 (patch)
treeb5f29b152417835df1240e120dfb70a2b18fe502 /arch
parent43c422eda99b894f18d1cca17bcd2401efaf7bd0 (diff)
downloadlinux-4e860696e050375ae7fbb06984c19e2bf6a322e0.tar.gz
linux-4e860696e050375ae7fbb06984c19e2bf6a322e0.tar.xz
s390/chpid: make headers usable (again)
Add back a hunk from "4dcc2a4 s390/chsc: make headers usable" which was lost during the merge of the UAPI patch. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/s390/include/uapi/asm/chpid.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/include/uapi/asm/chpid.h b/arch/s390/include/uapi/asm/chpid.h
index 581992dfae27..6b4fb29cc197 100644
--- a/arch/s390/include/uapi/asm/chpid.h
+++ b/arch/s390/include/uapi/asm/chpid.h
@@ -1,5 +1,5 @@
/*
- * Copyright IBM Corp. 2007
+ * Copyright IBM Corp. 2007, 2012
* Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
*/
@@ -12,10 +12,10 @@
#define __MAX_CHPID 255
struct chp_id {
- u8 reserved1;
- u8 cssid;
- u8 reserved2;
- u8 id;
+ __u8 reserved1;
+ __u8 cssid;
+ __u8 reserved2;
+ __u8 id;
} __attribute__((packed));