aboutsummaryrefslogtreecommitdiff
path: root/arch/x86/kernel/tlb_64.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-09 11:39:02 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-09 11:39:02 +0200
commitd028203c0446c7f65ed2b22342a56f03c6c4a6c1 (patch)
tree6bd73a5c70b407491dc9d40ecb9e95b48233d004 /arch/x86/kernel/tlb_64.c
parentf57e91682d141ea50d8c6d42cdc251b6256a3755 (diff)
parent183fe065652dbd64953afa9f389327e23e97967f (diff)
Merge branch 'x86/core' into x86/unify-pci
Diffstat (limited to 'arch/x86/kernel/tlb_64.c')
-rw-r--r--arch/x86/kernel/tlb_64.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/kernel/tlb_64.c b/arch/x86/kernel/tlb_64.c
index a1f07d79320..5039d0f097a 100644
--- a/arch/x86/kernel/tlb_64.c
+++ b/arch/x86/kernel/tlb_64.c
@@ -15,6 +15,8 @@
#include <asm/proto.h>
#include <asm/apicdef.h>
#include <asm/idle.h>
+#include <asm/uv/uv_hub.h>
+#include <asm/uv/uv_bau.h>
#include <mach_ipi.h>
/*
@@ -162,6 +164,9 @@ void native_flush_tlb_others(const cpumask_t *cpumaskp, struct mm_struct *mm,
union smp_flush_state *f;
cpumask_t cpumask = *cpumaskp;
+ if (is_uv_system() && uv_flush_tlb_others(&cpumask, mm, va))
+ return;
+
/* Caller has disabled preemption */
sender = smp_processor_id() % NUM_INVALIDATE_TLB_VECTORS;
f = &per_cpu(flush_state, sender);