Merge tag 'hsi-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

2a70ea5c · Linus Torvalds <[email protected]> · 2018-06-09 12:09:26 -07:00

Pull HSI update from Sebastian Reichel:
 "Just one patch for the HSI subsystem this time: use the new vm_fault_t
  return type"

* tag 'hsi-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  hsi: clients: Change return type to vm_fault_t

Commit: 2a70ea5cda00214a1d573acf19fa0cd06d947e38
Parents: 6419945e · 70d52ba9

Merge commit. Changes below are compared with the first parent: 6419945e.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
drivers/hsi/clients/cmt_speech.c	modified	+1	−1	View file

drivers/hsi/clients/cmt_speech.c

View file

diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c
index 324cb8e..a1d4b93 100644
--- a/drivers/hsi/clients/cmt_speech.c
+++ b/drivers/hsi/clients/cmt_speech.c
@@ -1098,7 +1098,7 @@ static void cs_hsi_stop(struct cs_hsi_iface *hi)
 	kfree(hi);
 }
 
-static int cs_char_vma_fault(struct vm_fault *vmf)
+static vm_fault_t cs_char_vma_fault(struct vm_fault *vmf)
 {
 	struct cs_char *csdata = vmf->vma->vm_private_data;
 	struct page *page;