Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 626f311737770f0fb5c09a6da2ea795a559aa42a

Authored by Adrian Bunk
Committed by Heiko Carstens
1 parent 9d853caf44
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[S390] chsc headers userspace cleanup 

Kernel headers shouldn't expose functions to userspace.

Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>

Showing 3 changed files with 7 additions and 4 deletions Side-by-side Diff

include/asm-s390/Kbuild
Diff comments   View file @ 626f311
... ... @@ -8,10 +8,10 @@
8 8 header-y += vtoc.h
9 9 header-y += zcrypt.h
10 10 header-y += kvm.h
11   -header-y += schid.h
12 11 header-y += chsc.h
13 12  
14 13 unifdef-y += cmb.h
15 14 unifdef-y += debug.h
16 15 unifdef-y += chpid.h
  16 +unifdef-y += schid.h
include/asm-s390/chpid.h
Diff comments   View file @ 626f311
... ... @@ -20,6 +20,9 @@
20 20 u8 id;
21 21 } __attribute__((packed));
22 22  
  23 +#ifdef __KERNEL__
  24 +#include <asm/cio.h>
  25 +
23 26 static inline void chp_id_init(struct chp_id *chpid)
24 27 {
25 28 memset(chpid, 0, sizeof(struct chp_id));
... ... @@ -39,9 +42,6 @@
39 42 chpid->cssid++;
40 43 }
41 44 }
42   -
43   -#ifdef __KERNEL__
44   -#include <asm/cio.h>
45 45  
46 46 static inline int chp_id_is_valid(struct chp_id *chpid)
47 47 {
include/asm-s390/schid.h
Diff comments   View file @ 626f311
... ... @@ -10,6 +10,7 @@
10 10 __u32 sch_no : 16;
11 11 } __attribute__ ((packed, aligned(4)));
12 12  
  13 +#ifdef __KERNEL__
13 14  
14 15 /* Helper function for sane state of pre-allocated subchannel_id. */
15 16 static inline void
... ... @@ -24,6 +25,8 @@
24 25 {
25 26 return !memcmp(schid1, schid2, sizeof(struct subchannel_id));
26 27 }
  28 +
  29 +#endif /* __KERNEL__ */
27 30  
28 31 #endif /* ASM_SCHID_H */