From patchwork Sun Feb 28 10:58:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 46490 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 8A092B7D71 for ; Sun, 28 Feb 2010 22:00:23 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031819Ab0B1K7Q (ORCPT ); Sun, 28 Feb 2010 05:59:16 -0500 Received: from mail-iw0-f182.google.com ([209.85.223.182]:51694 "EHLO mail-iw0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031811Ab0B1K7O (ORCPT ); Sun, 28 Feb 2010 05:59:14 -0500 Received: by mail-iw0-f182.google.com with SMTP id 12so1589776iwn.21 for ; Sun, 28 Feb 2010 02:59:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=5sSFR3akoInl9mThH8pnnKs9AvPfnFWOVmy/AvtDNSQ=; b=VPana/xOnum7dz7+07hMHJ1cciIf54+QPJQZhCcT3dG+B6HsZM35Embc089qfnSmEc CIYel8FA2A8L5yG3a1d1OWU9pyQVj3gSjtT53zCQgf0wURCgmTm3d6v/oU7uoocSnF42 pc+fPuGMTH2kX5sW8J0+C97ofEqyNxUB9vq8M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=JAWwC79ufe2vtna6LVO7lGJJm2O0GnaXYGl6ZPlhXYgIbqpQN8spJ6NJBQ87pcBIKZ VCVkNZ/dB958l/bzR9rEwWoFRwuH7clJzzTamoVMUMmZvag1+n/bD3NKnjmawaUvUAwi QbOaHPjxdtjl47+5o3/TuTTxQm/i7/SSyfYmU= Received: by 10.231.158.195 with SMTP id g3mr1085854ibx.46.1267354753884; Sun, 28 Feb 2010 02:59:13 -0800 (PST) Received: from localhost (p12140-adsao01yokonib1-acca.kanagawa.ocn.ne.jp [61.199.6.140]) by mx.google.com with ESMTPS id 20sm1951536iwn.1.2010.02.28.02.59.12 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 28 Feb 2010 02:59:13 -0800 (PST) From: Akinobu Mita To: linux-kernel@vger.kernel.org Cc: Akinobu Mita , "David S. Miller" , sparclinux@vger.kernel.org Subject: [PATCH] sparc: use __ratelimit Date: Sun, 28 Feb 2010 19:58:17 +0900 Message-Id: <1267354697-6456-5-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 1.6.0.6 In-Reply-To: <1267354697-6456-1-git-send-email-akinobu.mita@gmail.com> References: <1267354697-6456-1-git-send-email-akinobu.mita@gmail.com> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org Replace open-coded rate limiting logic with __ratelimit(). Signed-off-by: Akinobu Mita Cc: "David S. Miller" Cc: sparclinux@vger.kernel.org --- arch/sparc/kernel/unaligned_64.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/sparc/kernel/unaligned_64.c b/arch/sparc/kernel/unaligned_64.c index 378ca82..f03641f 100644 --- a/arch/sparc/kernel/unaligned_64.c +++ b/arch/sparc/kernel/unaligned_64.c @@ -21,6 +21,7 @@ #include #include #include +#include #include enum direction { @@ -274,13 +275,9 @@ static void kernel_mna_trap_fault(int fixup_tstate_asi) static void log_unaligned(struct pt_regs *regs) { - static unsigned long count, last_time; + static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5); - if (time_after(jiffies, last_time + 5 * HZ)) - count = 0; - if (count < 5) { - last_time = jiffies; - count++; + if (__ratelimit(&ratelimit)) { printk("Kernel unaligned access at TPC[%lx] %pS\n", regs->tpc, (void *) regs->tpc); }