[merged mm-stable] mm-oom_kill-proc-replace-magic-number-1000-with-oom_score_adj_max.patch removed from -mm tree

[merged mm-stable] mm-oom_kill-proc-replace-magic-number-1000-with-oom_score_adj_max.patch removed from -mm tree

[Andrew Morton]

The quilt patch titled
     Subject: mm/oom_kill, proc: replace magic number 1000 with OOM_SCORE_ADJ_MAX
has been removed from the -mm tree.  Its filename was
     mm-oom_kill-proc-replace-magic-number-1000-with-oom_score_adj_max.patch

This patch was dropped because it was merged into the mm-stable branch
of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Ye Liu <liuye@kylinos.cn>
Subject: mm/oom_kill, proc: replace magic number 1000 with OOM_SCORE_ADJ_MAX
Date: Tue, 11 Aug 2026 11:36:08 +0800

In oom_badness() and proc_oom_score(), the oom_score_adj normalization
uses a hardcoded 1000, which is the value of OOM_SCORE_ADJ_MAX defined in
include/uapi/linux/oom.h.  Other code in the kernel (e.g.  fs/proc/base.c
oom_adj handling) already uses OOM_SCORE_ADJ_MAX for the same purpose.

Replace the magic number with the macro for consistency and readability. 
No functional change.

Link: https://lore.kernel.org/20260811033609.3992348-1-ye.liu@linux.dev
Signed-off-by: Ye Liu <liuye@kylinos.cn>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Michal Hocko <mhocko@suse.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Shakeel Butt <shakeel.butt@linux.dev>
Cc: Song Hu <husong@kylinos.cn>
---

 fs/proc/base.c |    3 ++-
 mm/oom_kill.c  |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

--- a/fs/proc/base.c~mm-oom_kill-proc-replace-magic-number-1000-with-oom_score_adj_max
+++ a/fs/proc/base.c
@@ -594,7 +594,8 @@ static int proc_oom_score(struct seq_fil
 	 * exporting for a long time so userspace might depend on it.
 	 */
 	if (badness != LONG_MIN)
-		points = (1000 + badness * 1000 / (long)totalpages) * 2 / 3;
+		points = (OOM_SCORE_ADJ_MAX +
+			  badness * OOM_SCORE_ADJ_MAX / (long)totalpages) * 2 / 3;
 
 	seq_printf(m, "%lu\n", points);
 
--- a/mm/oom_kill.c~mm-oom_kill-proc-replace-magic-number-1000-with-oom_score_adj_max
+++ a/mm/oom_kill.c
@@ -230,7 +230,7 @@ long oom_badness(struct task_struct *p,
 	task_unlock(p);
 
 	/* Normalize to oom_score_adj units */
-	adj *= totalpages / 1000;
+	adj *= totalpages / OOM_SCORE_ADJ_MAX;
 	points += adj;
 
 	return points;
_

Patches currently in -mm which might be from liuye@kylinos.cn are

mm-vmalloc-group-xa_init-with-vbq-field-initializations.patch
mm-vmalloc-extract-vmap_insert_free_area-helper.patch
mm-vmalloc-extract-show_busy_info-from-vmalloc_info_show.patch
mm-vmalloc-fix-vmalloc_dump_obj-address-alignment-for-last-page-lookups.patch
mm-vmalloc-fix-vmalloc_dump_obj-cross-zone-va-lookup.patch