summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-09 12:09:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-09 12:09:26 -0700
commit2a70ea5cda00214a1d573acf19fa0cd06d947e38 (patch)
tree17b53255c485f4284dcdd8ca7db4f4667420c6e8
parent6419945e3313fd894af79caefca6823d4511133f (diff)
parent70d52ba9e57eb93cfe916f7f4d14a09750890ffd (diff)
downloadlinux-2a70ea5cda00214a1d573acf19fa0cd06d947e38.tar.bz2
Merge tag 'hsi-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi
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
-rw-r--r--drivers/hsi/clients/cmt_speech.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hsi/clients/cmt_speech.c b/drivers/hsi/clients/cmt_speech.c
index 324cb8ec9405..a1d4b9366496 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;