Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10bb10dc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

parents 3bf39599 e445ee65
Loading
Loading
Loading
Loading
+3 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,9 @@ int sbusfb_mmap_helper(struct sbus_mmap_map *map,
	unsigned long off;
	unsigned long off;
	int i;
	int i;
                                        
                                        
	if (!(vma->vm_flags & (VM_SHARED | VM_MAYSHARE)))
		return -EINVAL;

	size = vma->vm_end - vma->vm_start;
	size = vma->vm_end - vma->vm_start;
	if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
	if (vma->vm_pgoff > (~0UL >> PAGE_SHIFT))
		return -EINVAL;
		return -EINVAL;