diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-18 17:41:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-18 17:41:32 +0100 |
| commit | 99937d6455cea95405ac681c86a857d0fcd530bd (patch) | |
| tree | 5a40a9ca966e5feda1040f9ef2c7798ac4d1e234 /arch/x86/xen/mmu.c | |
| parent | 74e7904559a10cbb9fbf9139c5c42fc87c0f62a4 (diff) | |
| parent | 87b264065880fa696c121dad8498a60524e0f6de (diff) | |
| download | talos-obmc-linux-99937d6455cea95405ac681c86a857d0fcd530bd.tar.gz talos-obmc-linux-99937d6455cea95405ac681c86a857d0fcd530bd.zip | |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Diffstat (limited to 'arch/x86/xen/mmu.c')
| -rw-r--r-- | arch/x86/xen/mmu.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 7bc7852cc5c4..98cb9869eb24 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -1063,11 +1063,7 @@ static void drop_other_mm_ref(void *info) struct mm_struct *mm = info; struct mm_struct *active_mm; -#ifdef CONFIG_X86_64 - active_mm = read_pda(active_mm); -#else - active_mm = __get_cpu_var(cpu_tlbstate).active_mm; -#endif + active_mm = percpu_read(cpu_tlbstate.active_mm); if (active_mm == mm) leave_mm(smp_processor_id()); |
