leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'disintegrate-s390-20121009' of

Browse Source 
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
This commit is contained in:
Martin Schwidefsky
2012-10-09 14:18:10 +02:00
parent 450e47da67 9807f75955
commit ab08ff34b4
59 changed files with 1258 additions and 1149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
arch/s390/include/asm/chpid.h
View File

@@ -2,23 +2,10 @@
* Copyright IBM Corp. 2007, 2012
* 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 */