diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-09 06:16:59 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-09 06:16:59 -0500 |
| commit | eca217b36e5d7d4377493d5cedd89105e66a5a72 (patch) | |
| tree | 71f0ecd5225c3033d509b77a23ad7bc576cf0ab6 /arch/x86/kernel/tlb_uv.c | |
| parent | 54a353a0f845c1dad5fc8183872e750d667838ac (diff) | |
| parent | e4d0407185cdbdcfd99fc23bde2e5454bbc46329 (diff) | |
Merge branch 'x86/paravirt' into x86/apic
Conflicts:
arch/x86/mach-voyager/voyager_smp.c
Diffstat (limited to 'arch/x86/kernel/tlb_uv.c')
| -rw-r--r-- | arch/x86/kernel/tlb_uv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c index 755ede02b13f..f396e61bcb34 100644 --- a/arch/x86/kernel/tlb_uv.c +++ b/arch/x86/kernel/tlb_uv.c | |||
| @@ -259,7 +259,7 @@ const struct cpumask *uv_flush_send_and_wait(int cpu, int this_blade, | |||
| 259 | * the cpu's, all of which are still in the mask. | 259 | * the cpu's, all of which are still in the mask. |
| 260 | */ | 260 | */ |
| 261 | __get_cpu_var(ptcstats).ptc_i++; | 261 | __get_cpu_var(ptcstats).ptc_i++; |
| 262 | return 0; | 262 | return flush_mask; |
| 263 | } | 263 | } |
| 264 | 264 | ||
| 265 | /* | 265 | /* |