On Wednesday, November 02, 2016 6:36 AM Jan Kara wrote:
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index 8e8b76d11bb4..2a4ebe3c67c6 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -297,8 +297,6 @@ struct vm_fault {
> gfp_t gfp_mask; /* gfp mask to be used for allocations */
> pgoff_t pgoff; /* Logical page offset based on vma */
> unsigned long address; /* Faulting virtual address */
> - void __user *virtual_address; /* Faulting virtual address masked by
> - * PAGE_MASK */
> pmd_t *pmd; /* Pointer to pmd entry matching
> * the 'address'
> */
We have a pmd field currently?
In [PATCH 01/20] mm: Change type of vmf->virtual_address we see
[1] __user * gone,
[2] no field of address added
and doubt stray merge occurred.
btw, s:01/20:01/21: in subject line?
Hillf
> diff --git a/include/linux/mm.h b/include/linux/mm.h
> index ef815b9cd426..a5636d646022 100644
> --- a/include/linux/mm.h
> +++ b/include/linux/mm.h
> @@ -295,7 +295,7 @@ struct vm_fault {
> unsigned int flags; /* FAULT_FLAG_xxx flags */
> gfp_t gfp_mask; /* gfp mask to be used for allocations */
> pgoff_t pgoff; /* Logical page offset based on vma */
> - void __user *virtual_address; /* Faulting virtual address */
> + unsigned long virtual_address; /* Faulting virtual address */
>
> struct page *cow_page; /* Handler may choose to COW */
> struct page *page; /* ->fault handlers should return a
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>