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

Commit 80a4b18d authored by Arjan van de Ven's avatar Arjan van de Ven
Browse files

select: fix alpha OSF wrapper 



... alpha calls the core select code from inside it's architecture
code for emulating OSF; this patch makes it compile again

Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
parent 2e94d1f7

arch/alpha/kernel/osf_sys.c

+7 −6
Original line number Diff line number Diff line
@@ -986,10 +986,12 @@ asmlinkage int 
osf_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp,

	   struct timeval32 __user *tvp)

{

	s64 timeout = MAX_SCHEDULE_TIMEOUT;

	struct timespec end_time, *to = NULL;

	if (tvp) {

		time_t sec, usec;



		to = &end_time;



		if (!access_ok(VERIFY_READ, tvp, sizeof(*tvp))

		    || __get_user(sec, &tvp->tv_sec)

		    || __get_user(usec, &tvp->tv_usec)) {
@@ -999,14 +1001,13 @@ osf_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp, 
		if (sec < 0 || usec < 0)

			return -EINVAL;



		if ((unsigned long) sec < MAX_SELECT_SECONDS) {

			timeout = (usec + 1000000/HZ - 1) / (1000000/HZ);

			timeout += sec * (unsigned long) HZ;

		}

		if (poll_select_set_timeout(to, sec, usec * NSEC_PER_USEC))

			return -EINVAL;		



	}



	/* OSF does not copy back the remaining time.  */

	return core_sys_select(n, inp, outp, exp, &timeout);

	return core_sys_select(n, inp, outp, exp, to);

}



struct rusage32 {