summaryrefslogtreecommitdiff
path: root/include/linux/compat.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-08-17 10:41:59 +0200
committerIngo Molnar <mingo@kernel.org>2015-08-17 10:41:59 +0200
commit5461bd81bf7f86503f393b0b1d57e69b1f1bd44e (patch)
tree25ec4a2f43019c4d7cc76eb6a967ec450add9401 /include/linux/compat.h
parent949163015ce6fdb76a5e846a3582d3c40c23c001 (diff)
parent2c6625cd545bdd66acff14f3394865d43920a5c7 (diff)
downloadlwn-5461bd81bf7f86503f393b0b1d57e69b1f1bd44e.tar.gz
lwn-5461bd81bf7f86503f393b0b1d57e69b1f1bd44e.zip
Merge tag 'v4.2-rc7' into x86/boot, to refresh the branch before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/compat.h')
-rw-r--r--include/linux/compat.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/compat.h b/include/linux/compat.h
index ab25814690bc..a76c9172b2eb 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -424,7 +424,7 @@ asmlinkage long compat_sys_settimeofday(struct compat_timeval __user *tv,
asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);
-extern int compat_printk(const char *fmt, ...);
+extern __printf(1, 2) int compat_printk(const char *fmt, ...);
extern void sigset_from_compat(sigset_t *set, const compat_sigset_t *compat);
extern void sigset_to_compat(compat_sigset_t *compat, const sigset_t *set);