git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/cleanups
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
xen
/
mmu.c
diff --git
a/arch/x86/xen/mmu.c
b/arch/x86/xen/mmu.c
index cb5e266a8bf752297eaf6fc0d822c9398239fadf..c913ca4f6958693f6d7357c53bf149076a4b6d4f 100644
(file)
--- a/
arch/x86/xen/mmu.c
+++ b/
arch/x86/xen/mmu.c
@@
-2436,7
+2436,6
@@
static const struct pv_mmu_ops xen_mmu_ops __initconst = {
.flush_tlb_others = xen_flush_tlb_others,
.pte_update = paravirt_nop,
- .pte_update_defer = paravirt_nop,
.pgd_alloc = xen_pgd_alloc,
.pgd_free = xen_pgd_free,