Skip to contentSkip to conversation

uio: convert to vm_fault_t

PATCH In review Souptick Joarder 1 participant 2 messages Sep 1, 2018 – Sep 10, 2018 Userspace I/O (UIO)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 uio: convert to vm_fault_t

As part of commit 9b85e95a3080 ("uio: Change return type to vm_fault_t") in 4.19-rc1, this conversion was missed. Now converted 'ret' to vm_fault_t type.

---
 drivers/uio/uio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/uio/uio.c +1 -1
index 70a7981..8fae1a4 100644
@@ -668,7 +668,7 @@ static vm_fault_t uio_vma_fault(struct vm_fault *vmf)
 	struct page *page;
 	unsigned long offset;
 	void *addr;
-	int ret = 0;
+	vm_fault_t ret = 0;
 	int mi;
 
 	mutex_lock(&idev->info_lock);
Signature · 1 line
1.9.1
#1 lore raw
Quoted 4 lines · Souptick Joarder

As part of commit 9b85e95a3080 ("uio: Change return type to vm_fault_t") in 4.19-rc1, this conversion was missed. Now converted 'ret' to vm_fault_t type.

Greg, this was missed. Yes, this is not a regression fix, but can we get this patch in 4.19-rc-X else it might go untraced and later generate compile error when actual vm_fault_t will be introduced ?

Quoted 22 lines
---
 drivers/uio/uio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/uio/uio.c +1 -2
index 70a7981..8fae1a4 100644
@@ -668,7 +668,7 @@ static vm_fault_t uio_vma_fault(struct vm_fault *vmf)
        struct page *page;
        unsigned long offset;
        void *addr;
-       int ret = 0;
+       vm_fault_t ret = 0;
        int mi;
 
        mutex_lock(&idev->info_lock);
--

1.9.1