[Prism54-devel] new commits, please test

[Luis R. Rodriguez]

On Thu, Mar 10, 2005 at 11:40:51AM +0100, Bruno Randolf wrote:
> On Thursday 10 March 2005 03:15, Luis R. Rodriguez wrote:
> >  * islpci_dev.c (prism54_bring_down): use msleep(50) instead of
> >  set_current_state(TASK_UNINTERRUPTIBLE) and
> >  schedule_timeout(50*HZ/1000)
> 
> this breaks the kernel 2.4 builds where msleep is not available. something 
> like this is needed to make it work again:
> 
> 
> Index: ksrc/prismcompat24.h
> ===================================================================
> --- ksrc/prismcompat24.h        (revision 528)
> +++ ksrc/prismcompat24.h        (working copy)
> @@ -77,4 +77,19 @@
>  #define DMA_32BIT_MASK 0x00000000ffffffffULL
>  #endif
> 
> +#if !defined(msec_to_jiffies)
> +#define msecs_to_jiffies(msecs) ((HZ * msecs + 999) / 1000)
> +#endif
> +
> +#if !defined(msleep)
> +#define msleep(msecs) \
> +{ \
> +               unsigned long timeout = msecs_to_jiffies(msecs) + 1; \
> +               while (timeout) { \
> +                       set_current_state(TASK_UNINTERRUPTIBLE); \
> +                       timeout = schedule_timeout(timeout); \
> +               } \
> +}
> +#endif
> +
>  #endif                         /* _PRISM_COMPAT_H */
> 
> 
> maybe it would be better to make this real functions like in 2.6 but i didn't 
> know where to put them?

Thanks I'll commit this. I wonder where Margit is, she would have
spotted this :). Anyway, we can get comments on backporting this to 2.4 wile we send
patches upstream to netdev. For now, it'll do on the prism54 compat
files. Thanks,

	Luis

-- 
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84  A34A 6ADD 4937 E20A 525E
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://prism54.org/pipermail/prism54-devel/attachments/20050310/a3042148/attachment.pgp