From owner-p4-projects@FreeBSD.ORG Tue Jan 8 23:18:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2FDA316A55F; Tue, 8 Jan 2008 23:18:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B431016A46D for ; Tue, 8 Jan 2008 23:18:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BBA1913C45D for ; Tue, 8 Jan 2008 23:18:44 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m08NIiNb053351 for ; Tue, 8 Jan 2008 23:18:44 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m08NIiKg053348 for perforce@freebsd.org; Tue, 8 Jan 2008 23:18:44 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 8 Jan 2008 23:18:44 GMT Message-Id: <200801082318.m08NIiKg053348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132831 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jan 2008 23:18:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=132831 Change 132831 by hselasky@hselasky_laptop001 on 2008/01/08 23:18:29 Compile fix for FreeBSD 6.3. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_port.h#23 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_port.h#23 (text+ko) ==== @@ -110,7 +110,7 @@ #define SCSI_MODE_SENSE MODE_SENSE #define usb_thread_create kthread_create1 -#define usb_thread_exit(err) kthread_exit(err) +#define usb_thread_exit(err) kthread_exit(err) #if (__NetBSD_Version__ >= 300000000) typedef void *usb_malloc_type; @@ -170,7 +170,7 @@ #endif #define usb_thread_create kthread_create -#define usb_thread_exit(err) kthread_exit(err) +#define usb_thread_exit(err) kthread_exit(err) typedef int usb_malloc_type; @@ -197,11 +197,13 @@ #if (__FreeBSD_version >= 700000) #define usb_thread_create(f, s, p, ...) \ kproc_create((f), (s), (p), RFHIGHPID, 0, __VA_ARGS__) -#define usb_thread_exit(err) kproc_exit(err) +#define usb_thread_exit(err) kproc_exit(err) #else #define usb_thread_create(f, s, p, ...) \ kthread_create((f), (s), (p), RFHIGHPID, 0, __VA_ARGS__) -#define usb_thread_exit(err) kthread_exit(err) +#define usb_thread_exit(err) kthread_exit(err) +#define thread_lock(td) mtx_lock_spin(&sched_lock) +#define thread_unlock(td) mtx_unlock_spin(&sched_lock) #endif #define clalloc(p, s, x) (clist_alloc_cblocks((p), (s), (s)), 0)