Messages in this thread Patch in this message | | | Date | Sun, 14 Apr 2013 09:06:39 -0700 | From | tip-bot for Andrea Arcangeli <> | Subject | [tip:x86/urgent] x86/mm/cpa/selftest: Fix false positive in CPA self test |
| |
Commit-ID: 18699739b60cb60230153ff5475b2ba92be185f9 Gitweb: http://git.kernel.org/tip/18699739b60cb60230153ff5475b2ba92be185f9 Author: Andrea Arcangeli <aarcange@redhat.com> AuthorDate: Thu, 11 Apr 2013 15:36:09 +0200 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Fri, 12 Apr 2013 06:39:20 +0200
x86/mm/cpa/selftest: Fix false positive in CPA self test
If the pmd is not present, _PAGE_PSE will not be set anymore. Fix the false positive.
Reported-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Andrea Arcangeli <aarcange@redhat.com> Cc: Stefan Bader <stefan.bader@canonical.com> Cc: Andy Whitcroft <apw@canonical.com> Cc: Mel Gorman <mgorman@suse.de> Cc: Borislav Petkov <bp@alien8.de> Link: http://lkml.kernel.org/r/1365687369-30802-1-git-send-email-aarcange@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org> --- arch/x86/mm/pageattr-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c index b008656..0e38951 100644 --- a/arch/x86/mm/pageattr-test.c +++ b/arch/x86/mm/pageattr-test.c @@ -68,7 +68,7 @@ static int print_split(struct split_state *s) s->gpg++; i += GPS/PAGE_SIZE; } else if (level == PG_LEVEL_2M) { - if (!(pte_val(*pte) & _PAGE_PSE)) { + if ((pte_val(*pte) & _PAGE_PRESENT) && !(pte_val(*pte) & _PAGE_PSE)) { printk(KERN_ERR "%lx level %d but not PSE %Lx\n", addr, level, (u64)pte_val(*pte));
| |