From patchwork Sun Mar 18 13:34:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 154506 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 44274B6FC3 for ; Tue, 24 Apr 2012 03:09:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754766Ab2DWRJa (ORCPT ); Mon, 23 Apr 2012 13:09:30 -0400 Received: from moutng.kundenserver.de ([212.227.17.10]:55194 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754295Ab2DWRIY (ORCPT ); Mon, 23 Apr 2012 13:08:24 -0400 Received: from mailone.linux-pingi.de (p5497CD69.dip.t-dialin.net [84.151.205.105]) by mrelayeu.kundenserver.de (node=mrbap3) with ESMTP (Nemesis) id 0MMWL8-1SJcfD1URa-008fz0; Mon, 23 Apr 2012 19:08:21 +0200 Received: from pingi6.linux-pingi.de (pingi6.linux-pingi.de [10.23.200.6]) by mailone.linux-pingi.de (Postfix) with ESMTP id 242F04FDB; Mon, 23 Apr 2012 19:08:17 +0200 (CEST) Received: by pingi6.linux-pingi.de (Postfix, from userid 1000) id 62B5A9FB80; Mon, 23 Apr 2012 19:05:50 +0200 (CEST) Date: Sun, 18 Mar 2012 14:34:12 +0100 Subject: [PATCH 15/28] mISDN: DSP scheduling fix From: Karsten Keil To: David Miller Cc: netdev@vger.kernel.org, isdn4linux@listserv.isdn4linux.de Message-Id: <20120423170550.62B5A9FB80@pingi6.linux-pingi.de> X-Provags-ID: V02:K0:Kk6RHl2J2TYi/SFaqpX8N6f+WzewKr8ZttioEZKZHvy 1EXj4tIR+VF/rgqsp06lKeQCIrfNiL11qmZZrdQc0VfuBslfiq HWaWkF8xsrtwBC/uZUU0D8j5Z/qJiH8Y87zM2otWxzriQrlYyq 9oHTxdyA3cldShCFIr91nDqIX/e33Asghj/sE5zMbhBklf7DYo dG6GpKqDRrgH/YqAOeOLoQb54rIrhbALbwy7fWcgL2Y2tmFYYX Ppomi4wv7nDjqz9B2EYwE9V1fw5arSc30OIP5H8JnYdXwoGmdH sMeDXkxfxdy/4UBeUtt4g9yUkY7p44ly/Inp+/F1tshnxD7WdO S/M7lXGfLE59B2qrFF05mpaPN5cY8FISM4/21uMH08PHC8CQTG QvQz8JRuzFp2UPeZpolVc0AEOb6ykP4xDA= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 */