Merge tag 'v3.11' into next

[mirror_ubuntu-artful-kernel.git] / drivers / tty / sysrq.c

diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c
index 749dae8c34891be014b142da56f4f7a8164e960e..40a9fe9d3b10f0170af31c4d8845d8cc609e6bb5 100644 (file)
--- a/drivers/tty/sysrq.c
+++ b/drivers/tty/sysrq.c
@@ -985,7 +985,7 @@ static int sysrq_reset_seq_param_set(const char *buffer,
        unsigned long val;
        int error;
 
-       error = strict_strtoul(buffer, 0, &val);
+       error = kstrtoul(buffer, 0, &val);
        if (error < 0)
                return error;