D25400.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D25400.diff
View Options

	Index: head/sys/compat/linuxkpi/common/src/linux_page.c
	===================================================================
	--- head/sys/compat/linuxkpi/common/src/linux_page.c
	+++ head/sys/compat/linuxkpi/common/src/linux_page.c
	@@ -199,7 +199,7 @@
	int count;

	prot = write ? (VM_PROT_READ \| VM_PROT_WRITE) : VM_PROT_READ;
	- len = ((size_t)nr_pages) << PAGE_SHIFT;
	+ len = ptoa((vm_offset_t)nr_pages);
	count = vm_fault_quick_hold_pages(map, start, len, prot, pages, nr_pages);
	return (count == -1 ? -EFAULT : nr_pages);
	}
	@@ -219,9 +219,8 @@
	return (0);

	MPASS(pages != NULL);
	- va = start;
	map = &curthread->td_proc->p_vmspace->vm_map;
	- end = start + (((size_t)nr_pages) << PAGE_SHIFT);
	+ end = start + ptoa((vm_offset_t)nr_pages);
	if (!vm_map_range_valid(map, start, end))
	return (-EINVAL);
	prot = write ? (VM_PROT_READ \| VM_PROT_WRITE) : VM_PROT_READ;
	Index: head/sys/dev/md/md.c
	===================================================================
	--- head/sys/dev/md/md.c
	+++ head/sys/dev/md/md.c
	@@ -1561,8 +1561,8 @@
	if (mdr->md_mediasize <= 0 \|\|
	(mdr->md_mediasize % PAGE_SIZE) != 0)
	return (EDOM);
	- oldpages = OFF_TO_IDX(round_page(sc->mediasize));
	- newpages = OFF_TO_IDX(round_page(mdr->md_mediasize));
	+ oldpages = OFF_TO_IDX(sc->mediasize);
	+ newpages = OFF_TO_IDX(mdr->md_mediasize);
	if (newpages < oldpages) {
	VM_OBJECT_WLOCK(sc->object);
	vm_object_page_remove(sc->object, newpages, 0, 0);