Merge branch 'akpm' (updates from Andrew Morton)

[karo-tx-linux.git] / arch / frv / kernel / traps.c

diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c
index 4bff48c19d29733e90d75cbad1d631f3cadc3aaf..a6d105d61b268d09dea36de65e367abde64994c8 100644 (file)
--- a/arch/frv/kernel/traps.c
+++ b/arch/frv/kernel/traps.c
@@ -523,7 +523,7 @@ void die_if_kernel(const char *str, ...)
                return;
 
        va_start(va, str);
-       vsprintf(buffer, str, va);
+       vsnprintf(buffer, sizeof(buffer), str, va);
        va_end(va);
 
        console_verbose();