resolve merge conflicts of 3252d11 to nyc-dev-plus-aosp (daa13eaa) · Commits · e / os / android_system_core

lmkd/lmkd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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];

		/*