ANDROID: lowmemorykiller: fix declaration order warnings
authorBrian Norris <briannorris@google.com>
Tue, 1 Mar 2016 01:40:05 +0000 (17:40 -0800)
committerBrian Norris <briannorris@google.com>
Tue, 1 Mar 2016 19:59:39 +0000 (11:59 -0800)
drivers/staging/android/lowmemorykiller.c: In function ‘lowmem_scan’:
drivers/staging/android/lowmemorykiller.c:174:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

Change-Id: I9de6cf2c374bc43131725a7ed666a033a4449ea9
Signed-off-by: Brian Norris <briannorris@google.com>
drivers/staging/android/lowmemorykiller.c

index 4cc3d02eacfb47fe502bd07f90eaf7ec9926f088..af49af0cca01ba4231ee0fc564cf56987371959d 100644 (file)
@@ -161,6 +161,10 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
                             p->comm, p->pid, oom_score_adj, tasksize);
        }
        if (selected) {
+               long cache_size = other_file * (long)(PAGE_SIZE / 1024);
+               long cache_limit = minfree * (long)(PAGE_SIZE / 1024);
+               long free = other_free * (long)(PAGE_SIZE / 1024);
+
                task_lock(selected);
                send_sig(SIGKILL, selected, 0);
                /*
@@ -171,9 +175,6 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
                if (selected->mm)
                        mark_oom_victim(selected);
                task_unlock(selected);
-               long cache_size = other_file * (long)(PAGE_SIZE / 1024);
-               long cache_limit = minfree * (long)(PAGE_SIZE / 1024);
-               long free = other_free * (long)(PAGE_SIZE / 1024);
                trace_lowmemory_kill(selected, cache_size, cache_limit, free);
                lowmem_print(1, "Killing '%s' (%d), adj %hd,\n" \
                                "   to free %ldkB on behalf of '%s' (%d) because\n" \