linux-kernel - [tip:numa/core] mm/migrate: Fix update_mmu_cache

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Thu, 13 Dec 2012 00:36:54 -0800
From:	tip-bot for Stephen Rothwell <sfr@...b.auug.org.au>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
	akpm@...ux-foundation.org, peterz@...radead.org,
	sfr@...b.auug.org.au, tglx@...utronix.de
Subject: [tip:numa/core] mm/migrate: Fix update_mmu_cache_pmd() use

Commit-ID:  8df383108f7b7eafcf89f26be5460b404c70ff29
Gitweb:     http://git.kernel.org/tip/8df383108f7b7eafcf89f26be5460b404c70ff29
Author:     Stephen Rothwell <sfr@...b.auug.org.au>
AuthorDate: Mon, 10 Dec 2012 19:54:02 +1100
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Mon, 10 Dec 2012 13:37:30 +0100

mm/migrate: Fix update_mmu_cache_pmd() use

Stephen Rothwell reported this linux-next build failure:

  mm/migrate.c: In function 'migrate_misplaced_transhuge_page_put':
  mm/migrate.c:1666:2: error: incompatible type for argument 3 of 'update_mmu_cache_pmd'

Caused by commit 7f7f03ce3820 ("mm, numa: Implement
migrate-on-fault lazy NUMA strategy for regular and THP pages")
from the tip tree and exposed by commit "x86: convert
update_mmu_cache() and update_mmu_cache_pmd() to functions" from
the akpm tree.

Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Peter Zijlstra <peterz@...radead.org>
Cc: Andrew Morton <akpm@...ux-foundation.org>
Link: http://lkml.kernel.org/r/20121210195402.1042a8ea5bfb57bb758007ac@canb.auug.org.au
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 mm/migrate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/migrate.c b/mm/migrate.c
index 9562fa8..d599657 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1625,7 +1625,7 @@ int migrate_misplaced_transhuge_page_put(struct mm_struct *mm,
 	page_add_new_anon_rmap(new_page, vma, haddr);
 
 	set_pmd_at(mm, haddr, pmd, entry);
-	update_mmu_cache_pmd(vma, address, entry);
+	update_mmu_cache_pmd(vma, address, &entry);
 	page_remove_rmap(page);
 	/*
 	 * Finish the charge transaction under the page table lock to
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/