diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-14 14:13:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-14 14:13:24 -0400 |
| commit | 6c4c4d4bdaff7ec0b7b26da67d741f639727c934 (patch) | |
| tree | 207d37c90d4a476a50b412158f9e0f4448344ba4 /arch/x86/xen | |
| parent | af788e35bff2b98a413c3e81b13c2a27ef6b7528 (diff) | |
| parent | 26564600c9e88c6572a5e6ef5ae9121907edfb7f (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"Misc fixes"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/mm: Flush lazy MMU when DEBUG_PAGEALLOC is set
x86/mm/cpa/selftest: Fix false positive in CPA self test
x86/mm/cpa: Convert noop to functional fix
x86, mm: Patch out arch_flush_lazy_mmu_mode() when running on bare metal
x86, mm, paravirt: Fix vmalloc_fault oops during lazy MMU updates
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/mmu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index a4ea92477e01..e006c18d288a 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
| @@ -2200,6 +2200,7 @@ static const struct pv_mmu_ops xen_mmu_ops __initconst = { | |||
| 2200 | .lazy_mode = { | 2200 | .lazy_mode = { |
| 2201 | .enter = paravirt_enter_lazy_mmu, | 2201 | .enter = paravirt_enter_lazy_mmu, |
| 2202 | .leave = xen_leave_lazy_mmu, | 2202 | .leave = xen_leave_lazy_mmu, |
| 2203 | .flush = paravirt_flush_lazy_mmu, | ||
| 2203 | }, | 2204 | }, |
| 2204 | 2205 | ||
| 2205 | .set_fixmap = xen_set_fixmap, | 2206 | .set_fixmap = xen_set_fixmap, |