[PATCH v2] misc: sgi-gru: Change return type to vm_fault_t

[PATCH v2] misc: sgi-gru: Change return type to vm_fault_t

[Souptick Joarder]

Use new return type vm_fault_t for fault handler. For
now, this is just documenting that the function returns
a VM_FAULT value rather than an errno. Once all instances
are converted, vm_fault_t will become a distinct type.

Commit 1c8f422059ae ("mm: change return type to vm_fault_t")

Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com>
Acked-by: Dimitri Sivanich <sivanich@hpe.com>
---
v2: Updated the change log

 drivers/misc/sgi-gru/grumain.c   | 2 +-
 drivers/misc/sgi-gru/grutables.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c
index 3641f13..ab174f28 100644
--- a/drivers/misc/sgi-gru/grumain.c
+++ b/drivers/misc/sgi-gru/grumain.c
@@ -926,7 +926,7 @@ struct gru_state *gru_assign_gru_context(struct gru_thread_state *gts)
  *
  * 	Note: gru segments alway mmaped on GRU_GSEG_PAGESIZE boundaries.
  */
-int gru_fault(struct vm_fault *vmf)
+vm_fault_t gru_fault(struct vm_fault *vmf)
 {
 	struct vm_area_struct *vma = vmf->vma;
 	struct gru_thread_state *gts;
diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
index b5e308b..3e041b6 100644
--- a/drivers/misc/sgi-gru/grutables.h
+++ b/drivers/misc/sgi-gru/grutables.h
@@ -147,6 +147,7 @@
 #include <linux/mutex.h>
 #include <linux/wait.h>
 #include <linux/mmu_notifier.h>
+#include <linux/mm_types.h>
 #include "gru.h"
 #include "grulib.h"
 #include "gruhandles.h"
@@ -665,7 +666,7 @@ extern unsigned long gru_reserve_cb_resources(struct gru_state *gru,
 		int cbr_au_count, char *cbmap);
 extern unsigned long gru_reserve_ds_resources(struct gru_state *gru,
 		int dsr_au_count, char *dsmap);
-extern int gru_fault(struct vm_fault *vmf);
+extern vm_fault_t gru_fault(struct vm_fault *vmf);
 extern struct gru_mm_struct *gru_register_mmu_notifier(void);
 extern void gru_drop_mmu_notifier(struct gru_mm_struct *gms);
 
-- 
1.9.1

Re: [PATCH v2] misc: sgi-gru: Change return type to vm_fault_t

[Dimitri Sivanich]

Acked-by: Dimitri Sivanich <sivanich@hpe.com>

On Wed, Apr 25, 2018 at 10:20:44AM +0530, Souptick Joarder wrote:
> Use new return type vm_fault_t for fault handler. For
> now, this is just documenting that the function returns
> a VM_FAULT value rather than an errno. Once all instances
> are converted, vm_fault_t will become a distinct type.
> 
> Commit 1c8f422059ae ("mm: change return type to vm_fault_t")
> 
> Signed-off-by: Souptick Joarder <jrdr.linux@gmail.com>
> Reviewed-by: Matthew Wilcox <mawilcox@microsoft.com>
> ---
> v2: Updated the change log
> 
>  drivers/misc/sgi-gru/grumain.c   | 2 +-
>  drivers/misc/sgi-gru/grutables.h | 3 ++-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c
> index 3641f13..ab174f28 100644
> --- a/drivers/misc/sgi-gru/grumain.c
> +++ b/drivers/misc/sgi-gru/grumain.c
> @@ -926,7 +926,7 @@ struct gru_state *gru_assign_gru_context(struct gru_thread_state *gts)
>   *
>   * 	Note: gru segments alway mmaped on GRU_GSEG_PAGESIZE boundaries.
>   */
> -int gru_fault(struct vm_fault *vmf)
> +vm_fault_t gru_fault(struct vm_fault *vmf)
>  {
>  	struct vm_area_struct *vma = vmf->vma;
>  	struct gru_thread_state *gts;
> diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h
> index b5e308b..3e041b6 100644
> --- a/drivers/misc/sgi-gru/grutables.h
> +++ b/drivers/misc/sgi-gru/grutables.h
> @@ -147,6 +147,7 @@
>  #include <linux/mutex.h>
>  #include <linux/wait.h>
>  #include <linux/mmu_notifier.h>
> +#include <linux/mm_types.h>
>  #include "gru.h"
>  #include "grulib.h"
>  #include "gruhandles.h"
> @@ -665,7 +666,7 @@ extern unsigned long gru_reserve_cb_resources(struct gru_state *gru,
>  		int cbr_au_count, char *cbmap);
>  extern unsigned long gru_reserve_ds_resources(struct gru_state *gru,
>  		int dsr_au_count, char *dsmap);
> -extern int gru_fault(struct vm_fault *vmf);
> +extern vm_fault_t gru_fault(struct vm_fault *vmf);
>  extern struct gru_mm_struct *gru_register_mmu_notifier(void);
>  extern void gru_drop_mmu_notifier(struct gru_mm_struct *gms);
>  
> -- 
> 1.9.1
>