aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/lockdep_proc.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-08-31 11:54:18 -0400
committerIngo Molnar <mingo@elte.hu>2009-08-31 12:05:25 -0400
commitbbe69aa57a7374b51242b95a54eefcf0d0393b7e (patch)
treec45e48d11cc9cb81a57c8c27f7243863b117cec8 /kernel/lockdep_proc.c
parenta417887637e862b434b293404f2a31ad1f282a58 (diff)
parent326ba5010a5429a5a528b268b36a5900d4ab0eba (diff)
Merge commit 'v2.6.31-rc8' into core/locking
Merge reason: we were on -rc4, move to -rc8 before applying a new batch of locking infrastructure changes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/lockdep_proc.c')
-rw-r--r--kernel/lockdep_proc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c
index ec33c6ad58dd..d4b3dbc79fdb 100644
--- a/kernel/lockdep_proc.c
+++ b/kernel/lockdep_proc.c
@@ -680,7 +680,8 @@ static int __init lockdep_proc_init(void)
680 &proc_lockdep_stats_operations); 680 &proc_lockdep_stats_operations);
681 681
682#ifdef CONFIG_LOCK_STAT 682#ifdef CONFIG_LOCK_STAT
683 proc_create("lock_stat", S_IRUSR, NULL, &proc_lock_stat_operations); 683 proc_create("lock_stat", S_IRUSR | S_IWUSR, NULL,
684 &proc_lock_stat_operations);
684#endif 685#endif
685 686
686 return 0; 687 return 0;