From patchwork Tue Apr 24 12:51:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 154669 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 CE331B6F62 for ; Tue, 24 Apr 2012 22:54:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754167Ab2DXMyl (ORCPT ); Tue, 24 Apr 2012 08:54:41 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:55550 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754081Ab2DXMyj (ORCPT ); Tue, 24 Apr 2012 08:54:39 -0400 Received: from mailone.linux-pingi.de (p5497CC26.dip.t-dialin.net [84.151.204.38]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0M3jdZ-1S5GyC0VkX-00qsSi; Tue, 24 Apr 2012 14:54:37 +0200 Received: from pingi6.linux-pingi.de (pingi6.linux-pingi.de [10.23.200.6]) by mailone.linux-pingi.de (Postfix) with ESMTP id C5FE15279; Tue, 24 Apr 2012 14:54:34 +0200 (CEST) Received: by pingi6.linux-pingi.de (Postfix, from userid 1000) id 3BA309FBA8; Tue, 24 Apr 2012 14:51:53 +0200 (CEST) From: Karsten Keil To: David Miller Cc: netdev@vger.kernel.org, Karsten Keil Subject: [PATCH 4/4] mISDN: DSP scheduling fix Date: Tue, 24 Apr 2012 14:51:52 +0200 Message-Id: <1335271912-5269-5-git-send-email-kkeil@linux-pingi.de> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <1335271912-5269-1-git-send-email-kkeil@linux-pingi.de> References: <1335271912-5269-1-git-send-email-kkeil@linux-pingi.de> X-Provags-ID: V02:K0:AAI7ychSMiSu1XkD29agydgurtc6thgJgqEmrH7Imm7 DtIMRez62dnQXfRMjL5cjxMHfsSGXN67+Ueofz+YUMHhsRjiBB MY/N1VewfqvuKDUmtZprAjx2PhLCX+uQbG8XxL9ADsYAcsPnXi 8Nhk6nLZLzppVh/0hc3Fk4K3gWvEmesyTXvVdlDSdP6qOOeNYD 2pqMaWTm4NrJqt4KV0XPTZEhb6c04UW89vvbHMEtKPDGgnhGWU TGQs5WR4jrWaDi5GNpTTVw3y0iFYqkIH5qs8XenJNMkMa20KBm Ed27S4B85eb5UEGw9wZ1fcwxiIu4gw+Z3rvuBLb3suTE0fXkGf jt/tZgTbdiwss7PX4IN4tOFlQ+lD8+NfXz1fAK6kYYkC8WDrd/ EEc8KgtyZOWy+5dcON/svjUy/uzK1K0ZLY= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Karsten Keil dsp_spl_jiffies need to be the same datatype as jiffies (which is ulong). If not, on 64 bit systems it will fallback to schedule the DSP every jiffie tic as soon jiffies become > 2^32. Signed-off-by: Karsten Keil --- drivers/isdn/mISDN/dsp.h | 4 +++- drivers/isdn/mISDN/dsp_cmx.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/isdn/mISDN/dsp.h b/drivers/isdn/mISDN/dsp.h index afe4173..e020957 100644 --- a/drivers/isdn/mISDN/dsp.h +++ b/drivers/isdn/mISDN/dsp.h @@ -76,7 +76,9 @@ extern u8 dsp_silence; #define MAX_SECONDS_JITTER_CHECK 5 extern struct timer_list dsp_spl_tl; -extern u32 dsp_spl_jiffies; + +/* the datatype need to match jiffies datatype */ +extern ulong dsp_spl_jiffies; /* the structure of conferences: * diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c index 0c104b9..3a3b3a5 100644 --- a/drivers/isdn/mISDN/dsp_cmx.c +++ b/drivers/isdn/mISDN/dsp_cmx.c @@ -1624,7 +1624,7 @@ send_packet: static u32 jittercount; /* counter for jitter check */ struct timer_list dsp_spl_tl; -u32 dsp_spl_jiffies; /* calculate the next time to fire */ +ulong dsp_spl_jiffies; /* calculate the next time to fire */ static u16 dsp_count; /* last sample count */ static int dsp_count_valid; /* if we have last sample count */