ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: daa13eaa92

* commit 'daa13eaa922670e08cc1a88a04b189e003dcf9ec':
  Fix misc-macro-parentheses warnings in lmkd.

Change-Id: I4488f937aac2a3bdd8e52f667f30b4dc5836f3ab
This commit is contained in:
Chih-Hung Hsieh 2016-05-19 23:08:56 +00:00 • committed by android-build-merger
commit a343667388
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lmkd/lmkd.c
View file

@ -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];
/*