diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2016-05-19 16:02:22 -0700 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2016-05-19 16:02:22 -0700 |
| commit | daa13eaa922670e08cc1a88a04b189e003dcf9ec (patch) | |
| tree | 60d33496d3bbc761fedca9e72629daae8085ed34 /lmkd | |
| parent | fdad5af164af9db300c11b07e7a5606e96fa1034 (diff) | |
| parent | 3252d11498b386677163366e3d0d5bfdad17ba41 (diff) | |
| download | core-daa13eaa922670e08cc1a88a04b189e003dcf9ec.tar.gz core-daa13eaa922670e08cc1a88a04b189e003dcf9ec.tar.bz2 core-daa13eaa922670e08cc1a88a04b189e003dcf9ec.zip | |
resolve merge conflicts of 3252d11 to nyc-dev-plus-aosp
Change-Id: I2973439a194a3048d009159d75572a5366021f21
Diffstat (limited to 'lmkd')
| -rw-r--r-- | lmkd/lmkd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lmkd/lmkd.c b/lmkd/lmkd.c index afc81ed6c..e404e4483 100644 --- 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]; /* |