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

Commit b74afe58 authored by Manuel Schölling's avatar Manuel Schölling Committed by Greg Kroah-Hartman
Browse files

misc: sgi-gru: use time_before() 



To be future-proof and for better readability the time comparisons are
modified to use time_before() instead of plain, error-prone math.

Signed-off-by: default avatarManuel Schölling <manuel.schoelling@gmx.de>
Acked-by: default avatarDimitri Sivanich <sivanich@sgi.com>
Signed-off-by: default avatarSudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d1824329

drivers/misc/sgi-gru/grumain.c

+3 −1
Original line number Diff line number Diff line
@@ -930,6 +930,7 @@ int gru_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
{

	struct gru_thread_state *gts;

	unsigned long paddr, vaddr;

	unsigned long expires;



	vaddr = (unsigned long)vmf->virtual_address;

	gru_dbg(grudev, "vma %p, vaddr 0x%lx (0x%lx)\n",
@@ -954,7 +955,8 @@ int gru_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 
			mutex_unlock(&gts->ts_ctxlock);

			set_current_state(TASK_INTERRUPTIBLE);

			schedule_timeout(GRU_ASSIGN_DELAY);  /* true hack ZZZ */

			if (gts->ts_steal_jiffies + GRU_STEAL_DELAY < jiffies)

			expires = gts->ts_steal_jiffies + GRU_STEAL_DELAY;

			if (time_before(expires, jiffies))

				gru_steal_context(gts);

			goto again;

		}