* Re: linux-next: Tree for Apr 30 (netdev: mellanox/mlx4)
[not found] <20130430165730.7779d7e5d8fdca911213cce7@canb.auug.org.au>
@ 2013-04-30 18:58 ` Randy Dunlap
2013-04-30 19:36 ` Eric Dumazet
0 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2013-04-30 18:58 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, netdev, Amir Vadai
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!
--
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for Apr 30 (netdev: mellanox/mlx4)
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
0 siblings, 1 reply; 6+ messages in thread
From: Eric Dumazet @ 2013-04-30 19:36 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, linux-kernel, netdev, Amir Vadai
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 ?
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)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for Apr 30 (netdev: mellanox/mlx4)
2013-04-30 19:36 ` Eric Dumazet
@ 2013-04-30 20:39 ` Randy Dunlap
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
0 siblings, 2 replies; 6+ messages in thread
From: Randy Dunlap @ 2013-04-30 20:39 UTC (permalink / raw)
To: Eric Dumazet
Cc: Stephen Rothwell, linux-next, linux-kernel, netdev, Amir Vadai
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: Tree for Apr 30 (netdev: mellanox/mlx4)
2013-04-30 20:39 ` Randy Dunlap
@ 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
1 sibling, 0 replies; 6+ messages in thread
From: Eric Dumazet @ 2013-04-30 20:47 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, linux-next, linux-kernel, netdev, Amir Vadai
On Tue, 2013-04-30 at 13:39 -0700, Randy Dunlap wrote:
> Yes, that fixes it. Thanks.
>
> Acked-by: Randy Dunlap <rdunlap@infradead.org>
>
Thanks, I'll send the official patch in a couple of minutes.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH net-next] mlx4_en: fix a build error on 32bit arches
2013-04-30 20:39 ` Randy Dunlap
2013-04-30 20:47 ` Eric Dumazet
@ 2013-04-30 20:53 ` Eric Dumazet
2013-04-30 23:01 ` David Miller
1 sibling, 1 reply; 6+ messages in thread
From: Eric Dumazet @ 2013-04-30 20:53 UTC (permalink / raw)
To: Randy Dunlap, David Miller
Cc: Stephen Rothwell, linux-next, linux-kernel, netdev, Amir Vadai
From: Eric Dumazet <edumazet@google.com>
commit b6c39bfcf1d7d63 ("net/mlx4_en: Add a service task")
added a build error on 32bit arches.
ERROR: "__udivdi3" [drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko]
undefined!
Fix this problem by using do_div()
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Amir Vadai <amirv@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx4/en_clock.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
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)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH net-next] mlx4_en: fix a build error on 32bit arches
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
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-04-30 23:01 UTC (permalink / raw)
To: eric.dumazet; +Cc: rdunlap, sfr, linux-next, linux-kernel, netdev, amirv
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 30 Apr 2013 13:53:51 -0700
> From: Eric Dumazet <edumazet@google.com>
>
> commit b6c39bfcf1d7d63 ("net/mlx4_en: Add a service task")
> added a build error on 32bit arches.
>
> ERROR: "__udivdi3" [drivers/net/ethernet/mellanox/mlx4/mlx4_en.ko]
> undefined!
>
> Fix this problem by using do_div()
>
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Eric Dumazet <edumazet@google.com>
> Acked-by: Randy Dunlap <rdunlap@infradead.org>
Applied, thanks for fixing this Eric.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-04-30 23:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20130430165730.7779d7e5d8fdca911213cce7@canb.auug.org.au>
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
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
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).