diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-02-04 10:27:44 +0100 |
| commit | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (patch) | |
| tree | 9dff0ddec4bf8b927a025b4bf9882cb1731170f3 /linux/dev/kernel/printk.c | |
| parent | bfdb3be16e5a20eebc97b3ca613d9a4da4465533 (diff) | |
| parent | 51e87d005139a435cd846ac5c224eed5042c4fa0 (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'linux/dev/kernel/printk.c')
| -rw-r--r-- | linux/dev/kernel/printk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux/dev/kernel/printk.c b/linux/dev/kernel/printk.c index 1c45b245..7c65d303 100644 --- a/linux/dev/kernel/printk.c +++ b/linux/dev/kernel/printk.c @@ -27,6 +27,7 @@ #include <stdarg.h> #include <asm/system.h> #include <kern/assert.h> +#include <kern/printf.h> #include <device/cons.h> static char buf[2048]; @@ -40,7 +41,8 @@ int printk (char *fmt, ...) { va_list args; - int n, flags; + int n; + unsigned long flags; char *p, *msg, *buf_end; static int msg_level = -1; |