path: root/mm
diff options
authorLinus Torvalds <>2014-09-22 11:58:23 -0700
committerLinus Torvalds <>2014-09-22 11:58:23 -0700
commitb0e2a55c6536f255ebe80bc84c3f565c2a8f2a9d (patch)
tree24365eb740701b3a142277679cb3a057a3107ee9 /mm
parent7c9a3730a5ef4c6240eaaa2d8dcdb8cc1627d715 (diff)
parent27fbe64bfa63cfb9da025975b59d96568caa2d53 (diff)
Merge tag 'for-linus' of git://
Pull KVM fixes from Paolo Bonzini: "Two very simple bugfixes, affecting all supported architectures" [ Two? There's three commits in here. Oh well, I guess Paolo didn't count the preparatory symbol export ] * tag 'for-linus' of git:// KVM: correct null pid check in kvm_vcpu_yield_to() KVM: check for !is_zero_pfn() in kvm_is_mmio_pfn() mm: export symbol dependencies of is_zero_pfn()
Diffstat (limited to 'mm')
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/memory.c b/mm/memory.c
index adeac306610f..d17f1bcd2a91 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -118,6 +118,8 @@ __setup("norandmaps", disable_randmaps);
unsigned long zero_pfn __read_mostly;
unsigned long highest_memmap_pfn __read_mostly;
* CONFIG_MMU architectures set up ZERO_PAGE in their paging_init()