Date: Tue, 6 Nov 2007 20:27:35 GMT From: "Philip M. Gollucci" <pgollucci@p6m7g8.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/117879: misc/zaptel: [PATCH]: unbreak 8.0-current Message-ID: <200711062027.lA6KRZ3x096237@www.freebsd.org> Resent-Message-ID: <200711062030.lA6KU3UU060789@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117879
>Category: ports
>Synopsis: misc/zaptel: [PATCH]: unbreak 8.0-current
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Nov 06 20:30:03 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Philip M. Gollucci
>Release: FreeBSD 8.0-CURRENT
>Organization:
Riderway Inc.
>Environment:
FreeBSD home.p6m7g8.net 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sun Nov 4 01:36:52 EDT 2007 pgollucci@home.p6m7g8.net:/usr/obj/usr/src/sys/HOME i386
>Description:
cvs rlog -r1.12 src/sys/sys/kthread.h
----------------------------
revision 1.12
date: 2007/10/26 17:03:22; author: julian; state: Exp; lines: +1 -1
kthread_exit needs no stinkin argument.
Prototype changed.
While I'm here, fix __this__ particular patch file name since its already there.
files/patch-zaptel::zaptel.c-> files/patch-zaptel__zaptel.c
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
cvs diff: files/patch-zaptel::zaptel.c was removed, no comparison available
cvs diff: files/patch-zaptel__zaptel.c is a new entry, no comparison available
--- /dev/null 2007-11-06 15:22:00.000000000 -0500
+++ files/patch-zaptel__zaptel.c 2007-11-06 15:19:08.000000000 -0500
@@ -0,0 +1,20 @@
+--- ./zaptel/zaptel.c.orig 2007-11-06 15:19:02.000000000 -0500
++++ ./zaptel/zaptel.c 2007-11-06 15:17:34.000000000 -0500
+@@ -254,7 +254,7 @@
+ while (1) {
+ if (kthread_must_exit) {
+ wakeup(cookie);
+- kthread_exit(0);
++ kthread_exit();
+ }
+
+ ZAP_LOCK(toselwakeup_lock);
+@@ -396,7 +396,7 @@
+
+ int schluffen(void *q)
+ {
+- int rc = tsleep(q, PZERO | PCATCH, "schluffen", 0);
++ int rc = tsleep(q, PZERO | PCATCH, "schluffen", 10);
+ switch(rc)
+ {
+ case EINTR:
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711062027.lA6KRZ3x096237>