Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  Revert "cpumask: use work_on_cpu in acpi-cpufreq.c for drv_read and drv_write"
  x86: fix apic.c build error on latest git
  x86: fix mpparse.c build error on latest git
  x86: avoid theoretical vmalloc fault loop
  x86, mtrr: fix types used in userspace exported header

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 9e268b6b204e..90dfae511a41 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -534,7 +534,7 @@ static int vmalloc_fault(unsigned long address)
            happen within a race in page table update. In the later
            case just flush. */
 
-        pgd = pgd_offset(current->mm ?: &init_mm, address);
+        pgd = pgd_offset(current->active_mm, address);
         pgd_ref = pgd_offset_k(address);
         if (pgd_none(*pgd_ref))
                 return -1;