diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-08-14 15:59:00 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-08-14 15:59:30 +0200 |
| commit | 4cd1993f0046fbc765dbf20af90966f5661e3789 (patch) | |
| tree | 8772c03b73159524183f08337b134503ddf8479e /kernel/lockdep_proc.c | |
| parent | 97fd9ed48ce2b807edc363bef3e817aeeb5cd5e6 (diff) | |
| parent | 64f1607ffbbc772685733ea63e6f7f4183df1b16 (diff) | |
| download | linux-4cd1993f0046fbc765dbf20af90966f5661e3789.tar.gz linux-4cd1993f0046fbc765dbf20af90966f5661e3789.tar.bz2 linux-4cd1993f0046fbc765dbf20af90966f5661e3789.zip | |
Merge branch 'linus' into timers/core
Reason: Martin's timekeeping cleanup series depends on both
timers/core and mainline changes.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/lockdep_proc.c')
| -rw-r--r-- | kernel/lockdep_proc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/lockdep_proc.c b/kernel/lockdep_proc.c index d7135aa2d2c4..e94caa666dba 100644 --- a/kernel/lockdep_proc.c +++ b/kernel/lockdep_proc.c @@ -758,7 +758,8 @@ static int __init lockdep_proc_init(void) &proc_lockdep_stats_operations); #ifdef CONFIG_LOCK_STAT - proc_create("lock_stat", S_IRUSR, NULL, &proc_lock_stat_operations); + proc_create("lock_stat", S_IRUSR | S_IWUSR, NULL, + &proc_lock_stat_operations); #endif return 0; |