From patchwork Thu Apr 26 06:54:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 155170 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 155B7B6FA0 for ; Thu, 26 Apr 2012 16:58:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752892Ab2DZG6M (ORCPT ); Thu, 26 Apr 2012 02:58:12 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:56082 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752477Ab2DZG6K (ORCPT ); Thu, 26 Apr 2012 02:58:10 -0400 Received: from mailone.linux-pingi.de (p5497CEE2.dip.t-dialin.net [84.151.206.226]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0LbJZC-1Rv5d31oC2-00l3V7; Thu, 26 Apr 2012 08:58:03 +0200 Received: from pingi6.linux-pingi.de (pingi6.linux-pingi.de [10.23.200.6]) by mailone.linux-pingi.de (Postfix) with ESMTP id 2D9295804; Thu, 26 Apr 2012 08:58:01 +0200 (CEST) Received: by pingi6.linux-pingi.de (Postfix, from userid 1000) id 1F78B9FBFF; Thu, 26 Apr 2012 08:54:48 +0200 (CEST) From: Karsten Keil To: David Miller Cc: netdev@vger.kernel.org, Karsten Keil Subject: [PATCH 4/4] mISDN: DSP scheduling fix (version 2) Date: Thu, 26 Apr 2012 08:54:48 +0200 Message-Id: <1335423288-30702-1-git-send-email-kkeil@linux-pingi.de> X-Mailer: git-send-email 1.7.3.4 X-Provags-ID: V02:K0:N4RveVgKCcIEP22nzIvFTCt0eWPUqP3DxCQ+Xc4Miot XONFnX2sSzuVAR5Ei5BIJEWktmtgPkTz95bT2eTFoPQdxB3Bxw DlvoS8KOPUdV2eSTYwPO69YzYYxfhrsnzf9j8D07kl5MqfsMwC 9d7Gmm8jtqxemJHQF4DSVHZqaevc5rkBDlPaxCv1iRcAbz78xM EsfHo2W6hxGtv8ACJojmuiivy0lN27JWPqcm09+nLCBeM0PNQq F+ulVPHC72DEXF5MJ28k8l3C5fuuFq33C/vw3ptnULL5Inyiev Ra93b1aXX7EYqnENvZUekLIq8Jf9Uo2lBfnUHGwPP1i7DdjiTV Q8xMl5X2T4FnCZgP0KcjjEDR4DzotYlmCTiLdUpk6RBLh3nvoY Dhrq3pmumnq6kPVJx+/YSy0uT15p9inlvQ= 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 unsigned long 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 */ +unsigned long 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 */