Merge branch 'ptp-virtual-clocks-and-timestamping'

[linux-2.6-microblaze.git] / mm / kmemleak.c

diff --git a/mm/kmemleak.c b/mm/kmemleak.c
index 92a2d48..228a2fb 100644 (file)
--- a/mm/kmemleak.c
+++ b/mm/kmemleak.c
@@ -219,7 +219,7 @@ static struct task_struct *scan_thread;
 static unsigned long jiffies_min_age;
 static unsigned long jiffies_last_scan;
 /* delay between automatic memory scannings */
-static signed long jiffies_scan_wait;
+static unsigned long jiffies_scan_wait;
 /* enables or disables the task stacks scanning */
 static int kmemleak_stack_scan = 1;
 /* protects the memory scanning, parameters and debug/kmemleak file access */
@@ -1567,7 +1567,7 @@ static int kmemleak_scan_thread(void *arg)
        }
 
        while (!kthread_should_stop()) {
-               signed long timeout = jiffies_scan_wait;
+               signed long timeout = READ_ONCE(jiffies_scan_wait);
 
                mutex_lock(&scan_mutex);
                kmemleak_scan();
@@ -1807,14 +1807,20 @@ static ssize_t kmemleak_write(struct file *file, const char __user *user_buf,
        else if (strncmp(buf, "scan=off", 8) == 0)
                stop_scan_thread();
        else if (strncmp(buf, "scan=", 5) == 0) {
-               unsigned long secs;
+               unsigned secs;
+               unsigned long msecs;
 
-               ret = kstrtoul(buf + 5, 0, &secs);
+               ret = kstrtouint(buf + 5, 0, &secs);
                if (ret < 0)
                        goto out;
+
+               msecs = secs * MSEC_PER_SEC;
+               if (msecs > UINT_MAX)
+                       msecs = UINT_MAX;
+
                stop_scan_thread();
-               if (secs) {
-                       jiffies_scan_wait = msecs_to_jiffies(secs * 1000);
+               if (msecs) {
+                       WRITE_ONCE(jiffies_scan_wait, msecs_to_jiffies(msecs));
                        start_scan_thread();
                }
        } else if (strncmp(buf, "scan", 4) == 0)