diff options
author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-10-09 08:18:10 -0400 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2012-10-09 08:18:10 -0400 |
commit | ab08ff34b44f752b664ebb312d2e110cf37a7f5e (patch) | |
tree | 80579bb79480ac303cad99c359549d4e86bcc773 /arch/s390/include/asm/chpid.h | |
parent | 450e47da67499aeb6f1700e8f84747460c11ab56 (diff) | |
parent | 9807f75955ea7f1877981056755284481873115c (diff) |
Merge tag 'disintegrate-s390-20121009' of
git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI patchset from David Howells:
"Can you merge the following branch into the s390 tree please.
This is to complete part of the UAPI disintegration for which the
preparatory patches were pulled recently."
Conflicts:
arch/s390/include/asm/chpid.h
Diffstat (limited to 'arch/s390/include/asm/chpid.h')
-rw-r--r-- | arch/s390/include/asm/chpid.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/s390/include/asm/chpid.h b/arch/s390/include/asm/chpid.h index 8af0b92c90c..38c405ef89c 100644 --- a/arch/s390/include/asm/chpid.h +++ b/arch/s390/include/asm/chpid.h | |||
@@ -2,23 +2,10 @@ | |||
2 | * Copyright IBM Corp. 2007, 2012 | 2 | * Copyright IBM Corp. 2007, 2012 |
3 | * Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com> | 3 | * Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com> |
4 | */ | 4 | */ |
5 | |||
6 | #ifndef _ASM_S390_CHPID_H | 5 | #ifndef _ASM_S390_CHPID_H |
7 | #define _ASM_S390_CHPID_H | 6 | #define _ASM_S390_CHPID_H |
8 | 7 | ||
9 | #include <linux/string.h> | 8 | #include <uapi/asm/chpid.h> |
10 | #include <linux/types.h> | ||
11 | |||
12 | #define __MAX_CHPID 255 | ||
13 | |||
14 | struct chp_id { | ||
15 | __u8 reserved1; | ||
16 | __u8 cssid; | ||
17 | __u8 reserved2; | ||
18 | __u8 id; | ||
19 | } __attribute__((packed)); | ||
20 | |||
21 | #ifdef __KERNEL__ | ||
22 | #include <asm/cio.h> | 9 | #include <asm/cio.h> |
23 | 10 | ||
24 | static inline void chp_id_init(struct chp_id *chpid) | 11 | 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) | |||
49 | 36 | ||
50 | #define chp_id_for_each(c) \ | 37 | #define chp_id_for_each(c) \ |
51 | for (chp_id_init(c); chp_id_is_valid(c); chp_id_next(c)) | 38 | for (chp_id_init(c); chp_id_is_valid(c); chp_id_next(c)) |
52 | #endif /* __KERNEL */ | ||
53 | |||
54 | #endif /* _ASM_S390_CHPID_H */ | 39 | #endif /* _ASM_S390_CHPID_H */ |