2004-11-01 15:02:38

by Mark_H_Johnson

[permalink] [raw]
Subject: Re: [Fwd: Re: [patch] Real-Time Preemption, -RT-2.6.9-mm1-V0.4]

>I've uploaded -V0.6.5 to the usual place:
>
> http://redhat.com/~mingo/realtime-preempt/

Hmm. I was in the middle of a V0.6.4 build when I saw this message.
I let it run but the build stopped with the following error:

CC [M] drivers/scsi/qla2xxx/qla_os.o
CC [M] drivers/usb/media/stv680.o
drivers/scsi/qla2xxx/qla_os.c: In function `qla2x00_do_dpc':
drivers/scsi/qla2xxx/qla_os.c:3193: warning: implicit declaration of
function `DECLARE_MUTEX_LOCKED'
drivers/scsi/qla2xxx/qla_os.c:3193: error: `sem' undeclared (first use in
this function)
drivers/scsi/qla2xxx/qla_os.c:3193: error: (Each undeclared identifier is
reported only once
drivers/scsi/qla2xxx/qla_os.c:3193: error: for each function it appears
in.)
drivers/scsi/qla2xxx/qla_os.c:3194: warning: ISO C90 forbids mixed
declarations and code

Based on my quick review of the updated patch, I don't see a fix for this
so I'll remove it from .config (and step up to V0.6.5) but if you get a
chance to fix this, please do.
--Mark


2004-11-01 15:37:15

by Ingo Molnar

[permalink] [raw]
Subject: Re: [Fwd: Re: [patch] Real-Time Preemption, -RT-2.6.9-mm1-V0.4]


* [email protected] <[email protected]> wrote:

> Hmm. I was in the middle of a V0.6.4 build when I saw this message.
> I let it run but the build stopped with the following error:
>
> CC [M] drivers/scsi/qla2xxx/qla_os.o
> CC [M] drivers/usb/media/stv680.o
> drivers/scsi/qla2xxx/qla_os.c: In function `qla2x00_do_dpc':
> drivers/scsi/qla2xxx/qla_os.c:3193: warning: implicit declaration of
> function `DECLARE_MUTEX_LOCKED'

the patch below should fix it, will be in the next release.

Ingo

--- linux/drivers/scsi/qla2xxx/qla_os.c.orig
+++ linux/drivers/scsi/qla2xxx/qla_os.c
@@ -3190,7 +3190,7 @@ qla2x00_free_sp_pool( scsi_qla_host_t *h
static int
qla2x00_do_dpc(void *data)
{
- DECLARE_MUTEX_LOCKED(sem);
+ DECLARE_MUTEX(sem);
scsi_qla_host_t *ha;
fc_port_t *fcport;
os_lun_t *q;
@@ -3204,6 +3204,8 @@ qla2x00_do_dpc(void *data)
int t;
os_tgt_t *tq;

+ down(&sem);
+
ha = (scsi_qla_host_t *)data;

lock_kernel();