X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=mm%2Fksm.c;h=310544a379ae9c7b886b3b50815e5f3d5a991ba8;hb=16fb951237c2b0b28037b992ee44e7ee401c30d1;hp=9a68b0cf0a1c4c8009ee25d2990530d7e2927132;hpb=fa514fbc57419505d0e9423dbb8742f2775f882e;p=deliverable%2Flinux.git

diff --git a/mm/ksm.c b/mm/ksm.c
index 9a68b0cf0a1c..310544a379ae 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -1905,7 +1905,8 @@ static ssize_t run_store(struct kobject *kobj, struct kobj_attribute *attr,
 
 			oom_score_adj = test_set_oom_score_adj(OOM_SCORE_ADJ_MAX);
 			err = unmerge_and_remove_all_rmap_items();
-			test_set_oom_score_adj(oom_score_adj);
+			compare_swap_oom_score_adj(OOM_SCORE_ADJ_MAX,
+								oom_score_adj);
 			if (err) {
 				ksm_run = KSM_RUN_STOP;
 				count = err;