From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757261AbZHQIC7 (ORCPT ); Mon, 17 Aug 2009 04:02:59 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757229AbZHQIC7 (ORCPT ); Mon, 17 Aug 2009 04:02:59 -0400 Received: from hera.kernel.org ([140.211.167.34]:34295 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757208AbZHQIC6 (ORCPT ); Mon, 17 Aug 2009 04:02:58 -0400 Date: Mon, 17 Aug 2009 08:01:39 GMT From: tip-bot for Li Zefan To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, lizf@cn.fujitsu.com, peterz@infradead.org, tglx@linutronix.de, mingo@elte.hu Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, lizf@cn.fujitsu.com, peterz@infradead.org, tglx@linutronix.de, mingo@elte.hu In-Reply-To: <4A88ED15.20800@cn.fujitsu.com> References: <4A88ED15.20800@cn.fujitsu.com> Subject: [tip:core/locking] lockdep: Fix missing entry in /proc/lock_stat Message-ID: Git-Commit-ID: 212274347fc4d2a7c56bf6c953b02c809e7e0be1 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Mon, 17 Aug 2009 08:01:40 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 212274347fc4d2a7c56bf6c953b02c809e7e0be1 Gitweb: http://git.kernel.org/tip/212274347fc4d2a7c56bf6c953b02c809e7e0be1 Author: Li Zefan AuthorDate: Mon, 17 Aug 2009 13:39:33 +0800 Committer: Ingo Molnar CommitDate: Mon, 17 Aug 2009 09:54:39 +0200 lockdep: Fix missing entry in /proc/lock_stat One entry is missing in the output of /proc/lock_stat. The cause is, when ls_start() is called the 2nd time, we should start from stats[@pos-1] but not stats[@pos], because pos == 0 is the header. Signed-off-by: Li Zefan Cc: Peter Zijlstra LKML-Reference: <4A88ED15.20800@cn.fujitsu.com> Signed-off-by: Ingo Molnar --- kernel/lockdep_proc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c index fba81f1..5dbe30b 100644 --- a/kernel/lockdep_proc.c +++ b/kernel/lockdep_proc.c @@ -634,7 +634,7 @@ static void *ls_start(struct seq_file *m, loff_t *pos) if (*pos == 0) return SEQ_START_TOKEN; - data->iter = data->stats + *pos; + data->iter = data->stats + (*pos - 1); if (data->iter >= data->iter_end) data->iter = NULL;