Merge tag 'v4.4.31' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / include / linux / syslog.h

diff --git a/include/linux/syslog.h b/include/linux/syslog.h
index 4b7b875a7ce1febdacb9f54c887210de0f28216f..c3a7f0cc3a275f711a0a41660825b00b2ae535f8 100644 (file)
--- a/include/linux/syslog.h
+++ b/include/linux/syslog.h
@@ -47,12 +47,12 @@
 #define SYSLOG_FROM_READER           0
 #define SYSLOG_FROM_PROC             1
 
-int do_syslog(int type, char __user *buf, int count, bool from_file);
+int do_syslog(int type, char __user *buf, int count, int source);
 
 #ifdef CONFIG_PRINTK
-int check_syslog_permissions(int type, bool from_file);
+int check_syslog_permissions(int type, int source);
 #else
-static inline int check_syslog_permissions(int type, bool from_file)
+static inline int check_syslog_permissions(int type, int source)
 {
        return 0;
 }