cvs commit: src/sys/alpha/alpha machdep.c src/sys/alpha/osf1 osf1_signal.c src/sys/amd64/amd64 machdep.c src/sys/compat/linprocfs linprocfs.c src/sys/compat/svr4 svr4_filio.c svr4_misc.c src/sys/i

[John Baldwin]

On 15-May-2003 Bruce Evans wrote:
> On Wed, 14 May 2003, John Baldwin wrote:
> 
>> On 14-May-2003 Kimura Fuyuki wrote:
>> > At Tue, 13 May 2003 13:36:02 -0700 (PDT),
>> > John Baldwin <jhb at freebsd.org> wrote:
>> >>   1.61      +23 -4     src/sys/sys/signalvar.h
>> >
>> > There seems to be missing #include <sys/queue.h>.
>>
>> Yes. :(  I wonder if it shouldn't be in sys/_lock.h
>> instead.
> 
> Less than it should include <sys/types.h> for its use of u_int (i.e.,
> it shouldn't).

Hmm, I can fix it to use unsigned instead if that is preferred:

Index: _lock.h
===================================================================
RCS file: /usr/cvs/src/sys/sys/_lock.h,v
retrieving revision 1.8
diff -u -r1.8 _lock.h
--- _lock.h     7 Jun 2002 14:37:09 -0000       1.8
+++ _lock.h     15 May 2003 14:45:51 -0000
@@ -35,7 +35,7 @@
        struct  lock_class *lo_class;
        const   char *lo_name;          /* Individual lock name. */
        const   char *lo_type;          /* General lock type. */
-       u_int   lo_flags;
+       unsigned lo_flags;
        TAILQ_ENTRY(lock_object) lo_list; /* List of all locks in system. */
        struct  witness *lo_witness;
 };
Index: _mutex.h
===================================================================
RCS file: /usr/cvs/src/sys/sys/_mutex.h,v
retrieving revision 1.9
diff -u -r1.9 _mutex.h
--- _mutex.h    29 Dec 2002 11:14:41 -0000      1.9
+++ _mutex.h    15 May 2003 14:46:07 -0000
@@ -37,7 +37,7 @@
 struct mtx {
        struct lock_object      mtx_object;     /* Common lock properties. */
        volatile uintptr_t      mtx_lock;       /* Owner and flags. */
-       volatile u_int          mtx_recurse;    /* Number of recursive holds. */
+       volatile unsigned       mtx_recurse;    /* Number of recursive holds. */
        TAILQ_HEAD(, thread)    mtx_blocked;    /* Threads blocked on us. */
        LIST_ENTRY(mtx)         mtx_contested;  /* Next contested mtx. */
 

-- 

John Baldwin <jhb at FreeBSD.org>  <><  http://www.FreeBSD.org/~jhb/
"Power Users Use the Power to Serve!"  -  http://www.FreeBSD.org/