From: Andrew Morton drivers/char/mspec.c: In function `mspec_fault': drivers/char/mspec.c:195: error: structure has no member named `vma' drivers/char/mspec.c:229: error: structure has no member named `vma' drivers/char/mspec.c: At top level: drivers/char/mspec.c:237: warning: initialization from incompatible pointer type Cc: Nick Piggin Signed-off-by: Andrew Morton --- drivers/char/mspec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff -puN drivers/char/mspec.c~mm-merge-nopfn-into-fault-fix drivers/char/mspec.c --- a/drivers/char/mspec.c~mm-merge-nopfn-into-fault-fix +++ a/drivers/char/mspec.c @@ -187,12 +187,12 @@ mspec_close(struct vm_area_struct *vma) * Creates a mspec page and maps it to user space. */ static struct page * -mspec_fault(struct fault_data *fdata) +mspec_fault(struct vm_area_struct *vma, struct fault_data *fdata) { unsigned long paddr, maddr; unsigned long pfn; int index = fdata->pgoff; - struct vma_data *vdata = fdata->vma->vm_private_data; + struct vma_data *vdata = vma->vm_private_data; maddr = (volatile unsigned long) vdata->maddr[index]; if (maddr == 0) { @@ -226,7 +226,7 @@ mspec_fault(struct fault_data *fdata) * be because another thread has installed the pte first, so it * is no problem. */ - vm_insert_pfn(fdata->vma, fdata->address, pfn); + vm_insert_pfn(vma, fdata->address, pfn); return NULL; } _