From patchwork Thu Dec 1 09:32:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 128669 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 50F151007D1 for ; Thu, 1 Dec 2011 20:32:26 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752363Ab1LAJcS (ORCPT ); Thu, 1 Dec 2011 04:32:18 -0500 Received: from mail-qy0-f174.google.com ([209.85.216.174]:55205 "EHLO mail-qy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751795Ab1LAJcR (ORCPT ); Thu, 1 Dec 2011 04:32:17 -0500 Received: by qyk7 with SMTP id 7so133981qyk.19 for ; Thu, 01 Dec 2011 01:32:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=message-id:subject:from:to:cc:date:in-reply-to:references :content-type:x-mailer:content-transfer-encoding:mime-version; bh=xpl7hMYlc7meLyc8UHfML5bgeo4ePYG4aygGGqOJf4o=; b=XjdDzMvYkp1Mg8TTepTVVeuCu3PlVRrZnvRvvIpyKziNLvrjC5lcADoKak7foCoJ9u TkH0+Z7OLBlPAb9fey2/QglSzMCCMTo+WYJBcQyott1LTbl2PH1n5Kcwz4JXLKCBHTBT HmKMoA3+o/SynHkPbzfx9CRGkeBGwGmfrXU9o= Received: by 10.229.66.208 with SMTP id o16mr1028629qci.155.1322731936951; Thu, 01 Dec 2011 01:32:16 -0800 (PST) Received: from [10.150.51.215] (gw0.net.jmsp.net. [212.23.165.14]) by mx.google.com with ESMTPS id v5sm5033642qao.21.2011.12.01.01.32.15 (version=SSLv3 cipher=OTHER); Thu, 01 Dec 2011 01:32:16 -0800 (PST) Message-ID: <1322731934.2335.12.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC> Subject: [PATCH net-next] netem: fix build error on 32bit arches From: Eric Dumazet To: Hagen Paul Pfeifer , David Miller Cc: netdev Date: Thu, 01 Dec 2011 10:32:14 +0100 In-Reply-To: <1322730108.2335.3.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC> References: <1322691627-20551-1-git-send-email-hagen@jauu.net> <1322691627-20551-2-git-send-email-hagen@jauu.net> <1322710225.2577.1.camel@edumazet-laptop> <1322730108.2335.3.camel@edumazet-HP-Compaq-6005-Pro-SFF-PC> X-Mailer: Evolution 3.2.1- Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ERROR: "__udivdi3" [net/sched/sch_netem.ko] undefined! Signed-off-by: Eric Dumazet Acked-by: Hagen Paul Pfeifer --- net/sched/sch_netem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) -- 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/net/sched/sch_netem.c b/net/sched/sch_netem.c index 9b7af9f..3bfd733 100644 --- a/net/sched/sch_netem.c +++ b/net/sched/sch_netem.c @@ -301,7 +301,10 @@ static psched_tdiff_t tabledist(psched_tdiff_t mu, psched_tdiff_t sigma, static psched_time_t packet_len_2_sched_time(unsigned int len, u32 rate) { - return PSCHED_NS2TICKS((u64)len * NSEC_PER_SEC / rate); + u64 ticks = (u64)len * NSEC_PER_SEC; + + do_div(ticks, rate); + return PSCHED_NS2TICKS(ticks); } /*