2.5.37 - xtime removal and __FUNCTION__ change
PATCH 1/1 2.5.37 - xtime removal and __FUNCTION__ change
Hi Linus,
Accompanying patch approved by author (me :-) ....
Roger.
----- Forwarded message from Francois Romieu <[email protected]> -----
From: Francois Romieu <[email protected]>
To: Rogier Wolff <[email protected]>
Date: Fri, 20 Sep 2002 22:11:38 +0200
Subject: [PATCH] 2.5.37 - xtime removal and __FUNCTION__ change
Greetings,
I hadn't done a compile fest on 2.5.x for quite some time. Interesting.
- __FUNCTION__ parsing doesn't seem to be welcome any more;
- xtime type has changed. do_gettimeofday() looks like the way to go.
Please forward to Linus if appropriate.
drivers/atm/firestream.c +3 -3
@@ -330,8 +330,8 @@ MODULE_PARM(fs_keystream, "i");#define FS_DEBUG_QSIZE 0x00001000 -#define func_enter () fs_dprintk (FS_DEBUG_FLOW, "fs: enter " __FUNCTION__ "\n") -#define func_exit () fs_dprintk (FS_DEBUG_FLOW, "fs: exit " __FUNCTION__ "\n") +#define func_enter () fs_dprintk(FS_DEBUG_FLOW, "fs: enter %s\n", __FUNCTION__ ) +#define func_exit () fs_dprintk(FS_DEBUG_FLOW, "fs: exit %s\n", __FUNCTION__ )struct fs_dev *fs_boards =NULL ;
@@ -814,7 +814,7 @@ static void process_incoming (struct fs_skb_put (skb, qe->p1 &0xffff );ATM_SKB (skb)->vcc = atm_vcc;atomic_inc (&atm_vcc->stats->rx); - skb->stamp = xtime; +do_gettimeofday (&skb->stamp);fs_dprintk (FS_DEBUG_ALLOC ,"Free rec-skb: %p (pushed)\n" , skb); atm_vcc->push (atm_vcc, skb);fs_dprintk (FS_DEBUG_ALLOC ,"Free rec-d: %p\n" , pe);
----- End forwarded message -----
Signature · 5 lines
** [email protected] ** http://www.BitWizard.nl/ ** +31-15-2600998 ** *-- BitWizard writes Linux device drivers for any device you may have! --* * The Worlds Ecosystem is a stable system. Stable systems may experience * * excursions from the stable situation. We are currenly in such an * * excursion: The stable situation does not include humans. ***************