summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Walle <bernhard@bwalle.de>2009-12-17 15:27:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-17 15:45:30 -0800
commit5d0bb2c4238e333ae18c5cd23f75e02a3dac3519 (patch)
tree17c755c117384b3ed568c5f04ec603be9b206198
parent0f05058531330854ff383237e1547044c67e5740 (diff)
downloadlinux-3.10-5d0bb2c4238e333ae18c5cd23f75e02a3dac3519.tar.gz
linux-3.10-5d0bb2c4238e333ae18c5cd23f75e02a3dac3519.tar.bz2
linux-3.10-5d0bb2c4238e333ae18c5cd23f75e02a3dac3519.zip
vt: don't export vt_kmsg_redirect() to userspace
Fix following warning in linux-next by guarding the function definition (both the "extern" and the inline) with #ifdef __KERNEL__. usr/include/linux/vt.h:89: userspace cannot call function or variable defined in the kernel Introduced by commit 5ada918b82399eef3afd6a71e3637697d6bd719f ("vt: introduce and use vt_kmsg_redirect() function"). Signed-off-by: Bernhard Walle <bernhard@bwalle.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/vt.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/vt.h b/include/linux/vt.h
index 3fb9944e50a..d5dd0bc408f 100644
--- a/include/linux/vt.h
+++ b/include/linux/vt.h
@@ -84,6 +84,8 @@ struct vt_setactivate {
#define VT_SETACTIVATE 0x560F /* Activate and set the mode of a console */
+#ifdef __KERNEL__
+
#ifdef CONFIG_VT_CONSOLE
extern int vt_kmsg_redirect(int new);
@@ -97,6 +99,8 @@ static inline int vt_kmsg_redirect(int new)
#endif
+#endif /* __KERNEL__ */
+
#define vt_get_kmsg_redirect() vt_kmsg_redirect(-1)
#endif /* _LINUX_VT_H */