[tip:x86/mm] x86/tlb: Fix build warning and crash when building for !SMP

From: tip-bot for Alex Shi
Date: Fri Jul 20 2012 - 18:35:22 EST

Commit-ID: 7efa1c87963d23cc57ba40c07316d3e28cc75a3a
Gitweb: http://git.kernel.org/tip/7efa1c87963d23cc57ba40c07316d3e28cc75a3a
Author: Alex Shi <alex.shi@xxxxxxxxx>
AuthorDate: Fri, 20 Jul 2012 09:18:23 +0800
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Fri, 20 Jul 2012 15:01:48 -0700

x86/tlb: Fix build warning and crash when building for !SMP

The incompatible parameter of flush_tlb_mm_range cause build warning.
Fix it by correct parameter.

Ingo Molnar found that this could also cause a user space crash.

Reported-by: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Reported-by: Ingo Molnar <mingo@xxxxxxxxxx>
Signed-off-by: Alex Shi <alex.shi@xxxxxxxxx>
Link: http://lkml.kernel.org/r/1342747103-19765-1-git-send-email-alex.shi@xxxxxxxxx
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
arch/x86/include/asm/tlbflush.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index b5a27bd..74a4433 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -105,10 +105,10 @@ static inline void flush_tlb_range(struct vm_area_struct *vma,

-static inline void flush_tlb_mm_range(struct vm_area_struct *vma,
+static inline void flush_tlb_mm_range(struct mm_struct *mm,
unsigned long start, unsigned long end, unsigned long vmflag)
- if (vma->vm_mm == current->active_mm)
+ if (mm == current->active_mm)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/