From: Randy Dunlap <rdunlap@infradead.org>
To: Eric Dumazet <eric.dumazet@gmail.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
Amir Vadai <amirv@mellanox.com>
Subject: Re: linux-next: Tree for Apr 30 (netdev: mellanox/mlx4)
Date: Tue, 30 Apr 2013 13:39:05 -0700 [thread overview]
Message-ID: <51802BE9.7020805@infradead.org> (raw)
In-Reply-To: <1367350578.11020.4.camel@edumazet-glaptop>
On 04/30/13 12:36, Eric Dumazet wrote:
> On Tue, 2013-04-30 at 11:58 -0700, Randy Dunlap wrote:
>> On 04/29/13 23:57, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Please do not add any v3.11 destined work to your linux-next included
>>> branches until after v3.10-rc1 is released.
>>>
>>> Changes since 20130429:
>>>
>>
>> on i386:
>>
>> ERROR: "__udivdi3" [drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko] undefined!
>>
>>
>
> Could you try the following patch/fix ?
Yes, that fixes it. Thanks.
Acked-by: Randy Dunlap <rdunlap@infradead.org>
> diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
> index 2f18121..fd64410 100644
> --- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c
> +++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c
> @@ -114,6 +114,7 @@ void mlx4_en_fill_hwtstamps(struct mlx4_en_dev *mdev,
> void mlx4_en_init_timestamp(struct mlx4_en_dev *mdev)
> {
> struct mlx4_dev *dev = mdev->dev;
> + u64 ns;
>
> memset(&mdev->cycles, 0, sizeof(mdev->cycles));
> mdev->cycles.read = mlx4_en_read_clock;
> @@ -133,10 +134,9 @@ void mlx4_en_init_timestamp(struct mlx4_en_dev *mdev)
> /* Calculate period in seconds to call the overflow watchdog - to make
> * sure counter is checked at least once every wrap around.
> */
> - mdev->overflow_period =
> - (cyclecounter_cyc2ns(&mdev->cycles,
> - mdev->cycles.mask) / NSEC_PER_SEC / 2)
> - * HZ;
> + ns = cyclecounter_cyc2ns(&mdev->cycles, mdev->cycles.mask);
> + do_div(ns, NSEC_PER_SEC / 2 / HZ);
> + mdev->overflow_period = ns;
> }
>
> void mlx4_en_ptp_overflow_check(struct mlx4_en_dev *mdev)
>
>
> --
--
~Randy
next prev parent reply other threads:[~2013-04-30 20:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-30 6:57 linux-next: Tree for Apr 30 Stephen Rothwell
2013-04-30 18:42 ` linux-next: Tree for Apr 30 (sound) Randy Dunlap
2013-04-30 18:58 ` linux-next: Tree for Apr 30 (netdev: mellanox/mlx4) Randy Dunlap
2013-04-30 19:36 ` Eric Dumazet
2013-04-30 20:39 ` Randy Dunlap [this message]
2013-04-30 20:47 ` Eric Dumazet
2013-04-30 20:53 ` [PATCH net-next] mlx4_en: fix a build error on 32bit arches Eric Dumazet
2013-04-30 23:01 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51802BE9.7020805@infradead.org \
--to=rdunlap@infradead.org \
--cc=amirv@mellanox.com \
--cc=eric.dumazet@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).