diff options
| author | rogersb11 <brettrogers11@gmail.com> | 2015-11-10 11:19:31 -0600 |
|---|---|---|
| committer | rogersb11 <brettrogers11@gmail.com> | 2015-11-10 14:01:25 -0500 |
| commit | b4d16f70c34ecb908c8a61e58ea51fecdd4a4b10 (patch) | |
| tree | 973e9aeb97bb13497d17a43e6f3c070381bc5b87 /include/linux/syslog.h | |
| parent | d177fbc2f0c263b06c18bda2eb46200a31bcbebd (diff) | |
| parent | 5dba9ddd98cbc7ad319d687887981a0ea0062c75 (diff) | |
| download | kernel_samsung_smdk4412-b4d16f70c34ecb908c8a61e58ea51fecdd4a4b10.zip kernel_samsung_smdk4412-b4d16f70c34ecb908c8a61e58ea51fecdd4a4b10.tar.gz kernel_samsung_smdk4412-b4d16f70c34ecb908c8a61e58ea51fecdd4a4b10.tar.bz2 | |
Merge remote-tracking branch 'korg/linux-3.0.y' into cm-13.0
Conflicts:
crypto/algapi.c
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/intel_display.c
drivers/video/fbmem.c
include/linux/nls.h
kernel/cgroup.c
kernel/signal.c
kernel/timeconst.pl
net/ipv4/ping.c
Change-Id: I1f532925d1743df74d66bcdd6fc92f05c72ee0dd
Diffstat (limited to 'include/linux/syslog.h')
| -rw-r--r-- | include/linux/syslog.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/syslog.h b/include/linux/syslog.h index 3891139..ce4c665 100644 --- a/include/linux/syslog.h +++ b/include/linux/syslog.h @@ -47,6 +47,12 @@ #define SYSLOG_FROM_CALL 0 #define SYSLOG_FROM_FILE 1 +/* + * Syslog priority (PRI) maximum length in char : '<[0-9]{1,3}>' + * See RFC5424 for details +*/ +#define SYSLOG_PRI_MAX_LENGTH 5 + int do_syslog(int type, char __user *buf, int count, bool from_file); #endif /* _LINUX_SYSLOG_H */ |