xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'origin/queue' into for-queue

Browse Source 
Conflicts:
	arch/powerpc/include/asm/Kbuild
	arch/powerpc/include/uapi/asm/Kbuild
This commit is contained in:
Alexander Graf
2012-10-31 13:36:18 +01:00
parent 8b5869ad85 81c52c56e2
commit 0588000eac
7494 changed files with 281730 additions and 143169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kvm/book3s_hv.c
View File

@@ -1459,7 +1459,7 @@ static const struct vm_operations_struct kvm_rma_vm_ops = {
static int kvm_rma_mmap(struct file *file, struct vm_area_struct *vma)
{
vma->vm_flags |= VM_RESERVED;
vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP;
vma->vm_ops = &kvm_rma_vm_ops;
return 0;
}