Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1770a80f authored by Souptick Joarder's avatar Souptick Joarder Committed by Greg Kroah-Hartman
Browse files

misc: sgi-gru: Change return type to vm_fault_t 



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 1c8f4220 ("mm: change return type to vm_fault_t")

Signed-off-by: default avatarSouptick Joarder <jrdr.linux@gmail.com>
Reviewed-by: default avatarMatthew Wilcox <mawilcox@microsoft.com>
Acked-by: default avatarDimitri Sivanich <sivanich@hpe.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 49cb93cb

drivers/misc/sgi-gru/grumain.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/misc/sgi-gru/grutables.h

+2 −1
Original line number Diff line number Diff line
@@ -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);