diff options
| author | Mister Oyster <oysterized@gmail.com> | 2017-05-20 20:50:05 +0200 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2017-05-20 20:50:05 +0200 |
| commit | 6bb90902ecc4df8cff1178e8d987a722507011ec (patch) | |
| tree | ebc45c45cb665e6203b4ac3483add2184bee1554 | |
| parent | e158dd421317df0239cd7c9e96472c6a4d0493a2 (diff) | |
mtk: mlog: fix build without lmk
| -rw-r--r-- | drivers/misc/mediatek/mlog/mlog_logger.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/misc/mediatek/mlog/mlog_logger.c b/drivers/misc/mediatek/mlog/mlog_logger.c index fdfaf934a..a1559dd47 100644 --- a/drivers/misc/mediatek/mlog/mlog_logger.c +++ b/drivers/misc/mediatek/mlog/mlog_logger.c @@ -500,6 +500,7 @@ struct task_struct *find_trylock_task_mm(struct task_struct *t) /* * it's copied from lowmemorykiller.c */ +#ifndef CONFIG_MEMCG static short lowmem_oom_score_adj_to_oom_adj(short oom_score_adj) { if (oom_score_adj == OOM_SCORE_ADJ_MAX) @@ -507,6 +508,7 @@ static short lowmem_oom_score_adj_to_oom_adj(short oom_score_adj) else return ((oom_score_adj * -OOM_DISABLE * 10) / OOM_SCORE_ADJ_MAX + 5) / 10; /* round */ } +#endif static void mlog_procinfo(void) { @@ -534,11 +536,13 @@ static void mlog_procinfo(void) if (!p->signal) goto unlock_continue; +#ifndef CONFIG_MEMCG #ifdef CONFIG_ANDROID_LOW_MEMORY_KILLER_AUTODETECT_OOM_ADJ_VALUES oom_score_adj = lowmem_oom_score_adj_to_oom_adj(p->signal->oom_score_adj); #else oom_score_adj = p->signal->oom_adj; #endif +#endif if (max_adj < oom_score_adj || oom_score_adj < min_adj) goto unlock_continue; |