Re: [tip:core/locking] lockdep: Update memory usage introduced byBFS

[Peter Zijlstra]

On Sat, 2009-07-18 at 14:24 +0000, tip-bot for Ming Lei wrote:
> Commit-ID:  292264ece1ffdc9dacc1af486e28ee91cc66fb2d
> Gitweb:     http://git.kernel.org/tip/292264ece1ffdc9dacc1af486e28ee91cc66fb2d
> Author:     Ming Lei <tom.leiming@xxxxxxxxx>
> AuthorDate: Thu, 16 Jul 2009 15:44:29 +0200
> Committer:  Ingo Molnar <mingo@xxxxxxx>
> CommitDate: Sat, 18 Jul 2009 16:02:56 +0200
> 
> lockdep: Update memory usage introduced by BFS
> 
> Also account the BFS memory usage.
> 
> Signed-off-by: Ming Lei <tom.leiming@xxxxxxxxx>
> Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
> LKML-Reference: <1246201486-7308-9-git-send-email-tom.leiming@xxxxxxxxx>
> Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
> 
> 
> ---
>  kernel/lockdep.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/kernel/lockdep.c b/kernel/lockdep.c
> index b896f23..930335d 100644
> --- a/kernel/lockdep.c
> +++ b/kernel/lockdep.c
> @@ -3429,7 +3429,8 @@ void __init lockdep_info(void)
>  		sizeof(struct list_head) * CLASSHASH_SIZE +
>  		sizeof(struct lock_list) * MAX_LOCKDEP_ENTRIES +
>  		sizeof(struct lock_chain) * MAX_LOCKDEP_CHAINS +
> -		sizeof(struct list_head) * CHAINHASH_SIZE) / 1024);
> +		sizeof(struct list_head) * CHAINHASH_SIZE) / 1024 +
> +		sizeof(struct circular_queue) + sizeof(bfs_accessed));
>  
>  	printk(" per task-struct memory footprint: %lu bytes\n",
>  		sizeof(struct held_lock) * MAX_LOCK_DEPTH);

/usr/src/linux-2.6/kernel/lockdep.c:3493: error: invalid application of
'sizeof' to incomplete type 'struct circular_queue'

This wants the following folded in.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
---
 kernel/lockdep.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 3718a98..33fdda9 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -3489,8 +3489,11 @@ void __init lockdep_info(void)
 		sizeof(struct list_head) * CLASSHASH_SIZE +
 		sizeof(struct lock_list) * MAX_LOCKDEP_ENTRIES +
 		sizeof(struct lock_chain) * MAX_LOCKDEP_CHAINS +
-		sizeof(struct list_head) * CHAINHASH_SIZE) / 1024 +
-		sizeof(struct circular_queue) + sizeof(bfs_accessed));
+		sizeof(struct list_head) * CHAINHASH_SIZE) / 1024
+#ifdef CONFIG_PROVE_LOCKING
+		+ sizeof(struct circular_queue) + sizeof(bfs_accessed)
+#endif
+		);
 
 	printk(" per task-struct memory footprint: %lu bytes\n",
 		sizeof(struct held_lock) * MAX_LOCK_DEPTH);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/