summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-09-22 20:58:23 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2014-09-22 20:58:23 +0200
commitb0e2a55c6536f255ebe80bc84c3f565c2a8f2a9d (patch)
tree24365eb740701b3a142277679cb3a057a3107ee9 /arch/s390
parentMerge branch 'for-3.17-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentKVM: correct null pid check in kvm_vcpu_yield_to() (diff)
downloadlinux-b0e2a55c6536f255ebe80bc84c3f565c2a8f2a9d.tar.xz
linux-b0e2a55c6536f255ebe80bc84c3f565c2a8f2a9d.zip
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
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://git.kernel.org/pub/scm/virt/kvm/kvm: 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 'arch/s390')
-rw-r--r--arch/s390/mm/init.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/mm/init.c b/arch/s390/mm/init.c
index 0c1073ed1e84..c7235e01fd67 100644
--- a/arch/s390/mm/init.c
+++ b/arch/s390/mm/init.c
@@ -43,6 +43,7 @@ pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE)));
unsigned long empty_zero_page, zero_page_mask;
EXPORT_SYMBOL(empty_zero_page);
+EXPORT_SYMBOL(zero_page_mask);
static void __init setup_zero_pages(void)
{