[PATCH] Fix for Oops-on-boot w/ alpha (not SCSI/NCR related)

Matthias Welwarsky (matze@stud.fbi.fh-darmstadt.de)
Thu, 12 Nov 1998 00:15:56 +0100


This is a multi-part message in MIME format.
--------------337C9583ABD475B629B0961B
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi Linus and list,

the following patch (relative 2.1.127) to arch/alpha/kernel/osf_sys.c
should fix the Oops-on-boot reported by some people on this list.
Looking at the patch, the reason seems obvious ;-)

Gruss,
Matthias
--------------337C9583ABD475B629B0961B
Content-Type: text/plain; charset=us-ascii; name="alpha_kernel_osf_sys_c-2.1.127-1.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="alpha_kernel_osf_sys_c-2.1.127-1.patch"

--- linux/arch/alpha/kernel/osf_sys.c.orig Wed Nov 11 23:38:25 1998
+++ linux/arch/alpha/kernel/osf_sys.c Wed Nov 11 23:56:12 1998
@@ -1136,7 +1136,7 @@
unsigned long timeout;
int ret;

- timeout = ~0UL;
+ timeout = MAX_SCHEDULE_TIMEOUT;
if (tvp) {
time_t sec, usec;

@@ -1147,8 +1147,6 @@

timeout = (usec + 1000000/HZ - 1) / (1000000/HZ);
timeout += sec * HZ;
- if (timeout)
- timeout += jiffies + 1;
}

ret = -ENOMEM;
@@ -1168,7 +1166,7 @@
zero_fd_set(n, fds->res_out);
zero_fd_set(n, fds->res_ex);

- ret = do_select(n, fds, timeout);
+ ret = do_select(n, fds, &timeout);

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

--------------337C9583ABD475B629B0961B--

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/