resolve merge conflicts of 3252d11 to nyc-dev-plus-aosp

Change-Id: I2973439a194a3048d009159d75572a5366021f21
2016-05-19 16:02:22 -07:00 · 2016-05-19 16:02:22 -07:00 · daa13eaa92
parent fdad5af164 3252d11498
commit daa13eaa92
1 changed files with 1 additions and 1 deletions
--- a/lmkd/lmkd.c
+++ b/lmkd/lmkd.c
@ -109,7 +109,7 @@ struct proc {
 static struct proc *pidhash[PIDHASH_SZ];
 #define pid_hashfn(x) ((((x) >> 8) ^ (x)) & (PIDHASH_SZ - 1))

-#define ADJTOSLOT(adj) (adj + -OOM_SCORE_ADJ_MIN)
+#define ADJTOSLOT(adj) ((adj) + -OOM_SCORE_ADJ_MIN)
 static struct adjslot_list procadjslot_list[ADJTOSLOT(OOM_SCORE_ADJ_MAX) + 1];

 /*