aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-07-17 17:16:42 +0200
committerHeiko Carstens <heiko.carstens@de.ibm.com>2008-07-17 17:22:08 +0200
commit626f311737770f0fb5c09a6da2ea795a559aa42a (patch)
tree63bbb68172ef45761483139771a3f22766c39e11
parent9d853caf44e6f969a9ad056a9937e8d97bc2c761 (diff)
[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>
-rw-r--r--include/asm-s390/Kbuild2
-rw-r--r--include/asm-s390/chpid.h6
-rw-r--r--include/asm-s390/schid.h3
3 files changed, 7 insertions, 4 deletions
diff --git a/include/asm-s390/Kbuild b/include/asm-s390/Kbuild
index 09f312501eb..bb5e9edb982 100644
--- a/include/asm-s390/Kbuild
+++ b/include/asm-s390/Kbuild
@@ -8,9 +8,9 @@ header-y += ucontext.h
header-y += vtoc.h
header-y += zcrypt.h
header-y += kvm.h
-header-y += schid.h
header-y += chsc.h
unifdef-y += cmb.h
unifdef-y += debug.h
unifdef-y += chpid.h
+unifdef-y += schid.h
diff --git a/include/asm-s390/chpid.h b/include/asm-s390/chpid.h
index 606844d0a5c..dfe3c7f3439 100644
--- a/include/asm-s390/chpid.h
+++ b/include/asm-s390/chpid.h
@@ -20,6 +20,9 @@ struct chp_id {
u8 id;
} __attribute__((packed));
+#ifdef __KERNEL__
+#include <asm/cio.h>
+
static inline void chp_id_init(struct chp_id *chpid)
{
memset(chpid, 0, sizeof(struct chp_id));
@@ -40,9 +43,6 @@ static inline void chp_id_next(struct chp_id *chpid)
}
}
-#ifdef __KERNEL__
-#include <asm/cio.h>
-
static inline int chp_id_is_valid(struct chp_id *chpid)
{
return (chpid->cssid <= __MAX_CSSID);
diff --git a/include/asm-s390/schid.h b/include/asm-s390/schid.h
index 5017ffa78e0..7bdc0fe1569 100644
--- a/include/asm-s390/schid.h
+++ b/include/asm-s390/schid.h
@@ -10,6 +10,7 @@ struct subchannel_id {
__u32 sch_no : 16;
} __attribute__ ((packed, aligned(4)));
+#ifdef __KERNEL__
/* Helper function for sane state of pre-allocated subchannel_id. */
static inline void
@@ -25,4 +26,6 @@ schid_equal(struct subchannel_id *schid1, struct subchannel_id *schid2)
return !memcmp(schid1, schid2, sizeof(struct subchannel_id));
}
+#endif /* __KERNEL__ */
+
#endif /* ASM_SCHID_H */