diff options
| author |   Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 11:54:33 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 11:54:33 +0100 |
| commit | 5b74f9e0e005baf12a2df6aaeef7d7134137792b (patch) | |
| tree | d3cef2c8c91fb415533e028bf55cc348d8818431 /arch/x86/mm/fault.c | |
| parent | Merge commit 'v2.6.29-rc1' into timers/hrtimers (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband (diff) | |
| download | linux-dev-5b74f9e0e005baf12a2df6aaeef7d7134137792b.tar.xz linux-dev-5b74f9e0e005baf12a2df6aaeef7d7134137792b.zip | |
Merge branch 'linus' into timers/hrtimers
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
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; |