From patchwork Tue Apr 30 19:36:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 240682 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BD0DC2C00C7 for ; Wed, 1 May 2013 05:36:45 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933327Ab3D3TgX (ORCPT ); Tue, 30 Apr 2013 15:36:23 -0400 Received: from mail-ie0-f172.google.com ([209.85.223.172]:38129 "EHLO mail-ie0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932746Ab3D3TgV (ORCPT ); Tue, 30 Apr 2013 15:36:21 -0400 Received: by mail-ie0-f172.google.com with SMTP id c12so1139344ieb.3 for ; Tue, 30 Apr 2013 12:36:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:subject:from:to:cc:date:in-reply-to :references:content-type:x-mailer:content-transfer-encoding :mime-version; bh=kzM4Qg1xNQH9bu9XKqZ83ICP4sG7sJM3EIE9N3DzIls=; b=TszbSTvn5MC3YsPc9CrunI/ejKt7sMI2v2VtdZyFHQQjtzF4xhRvOM9Nf0Nf2yssZL gbrGyfuIQw550Z+pxgv1A4cYXrwycCYDgCySTLLo2gDQ9jDME6Q5HAC93Pe9IBgQIBFH KXelzrtWXQhB5HkyFdj0GCP2tfL8tV6HQq1E9140kBRGk3msH9clnOmp0bcU6q0mt4h2 1CeVVlq4O5Kq6ETKizFrqVelUrZRhqwPxcDSt3+3d9TWJWJ386henkys4MXVktBbClCI NZagHcbkPSouyxyjHyIg5ON5Tpn/XDkXcIyQtaMXaAPsITDR+EuEFaqFI6u+XA7OgMpn o0xg== X-Received: by 10.50.136.167 with SMTP id qb7mr4725858igb.98.1367350581207; Tue, 30 Apr 2013 12:36:21 -0700 (PDT) Received: from ?IPv6:2620:0:1000:3304:d932:31fe:be2c:e81a? ([2620:0:1000:3304:d932:31fe:be2c:e81a]) by mx.google.com with ESMTPSA id ua6sm24070687igb.0.2013.04.30.12.36.19 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Tue, 30 Apr 2013 12:36:20 -0700 (PDT) Message-ID: <1367350578.11020.4.camel@edumazet-glaptop> Subject: Re: linux-next: Tree for Apr 30 (netdev: mellanox/mlx4) From: Eric Dumazet To: Randy Dunlap Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "netdev@vger.kernel.org" , Amir Vadai Date: Tue, 30 Apr 2013 12:36:18 -0700 In-Reply-To: <51801449.7080600@infradead.org> References: <20130430165730.7779d7e5d8fdca911213cce7@canb.auug.org.au> <51801449.7080600@infradead.org> X-Mailer: Evolution 3.2.3-0ubuntu6 Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 ? Acked-by: Randy Dunlap --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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)