diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 09:32:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-04-27 09:32:30 +0200 |
| commit | f6402eb4a2b3192bdf23fa39ef8e85fd3691cca9 (patch) | |
| tree | da8d55cd97d59cfe689fe447d98637204f2218e3 /include/linux/vmalloc.h | |
| parent | 992a60ed0d5e312ce9a485c9e12097ac82ae4b3e (diff) | |
| parent | 6a8b55ed4056ea5559ebe4f6a4b247f627870d4c (diff) | |
| download | cachepc-linux-f6402eb4a2b3192bdf23fa39ef8e85fd3691cca9.tar.gz cachepc-linux-f6402eb4a2b3192bdf23fa39ef8e85fd3691cca9.zip | |
Merge 5.7-rc3 into usb-next
We need the USB fixes in here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/vmalloc.h')
| -rw-r--r-- | include/linux/vmalloc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 0507a162ccd0..a95d3cc74d79 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -137,7 +137,7 @@ extern void vunmap(const void *addr); extern int remap_vmalloc_range_partial(struct vm_area_struct *vma, unsigned long uaddr, void *kaddr, - unsigned long size); + unsigned long pgoff, unsigned long size); extern int remap_vmalloc_range(struct vm_area_struct *vma, void *addr, unsigned long pgoff); |