diff options
| author | James Morris <jmorris@namei.org> | 2010-05-17 18:57:00 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-17 18:57:00 -0400 |
| commit | 539c99fd7fc28f8db257c713c10fb4aceadf8887 (patch) | |
| tree | e603e48ac816cde56e4872e0f7bcdfe7bd33f3b3 /security/keys/proc.c | |
| parent | ba2e1c5f25a99dec3873745031ad23ce3fd79bff (diff) | |
| parent | 4d09ec0f705cf88a12add029c058b53f288cfaa2 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'security/keys/proc.c')
| -rw-r--r-- | security/keys/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/proc.c b/security/keys/proc.c index 706d63f4f185..068b66ea2f1b 100644 --- a/security/keys/proc.c +++ b/security/keys/proc.c | |||
| @@ -306,7 +306,7 @@ static void *proc_key_users_start(struct seq_file *p, loff_t *_pos) | |||
| 306 | static void *proc_key_users_next(struct seq_file *p, void *v, loff_t *_pos) | 306 | static void *proc_key_users_next(struct seq_file *p, void *v, loff_t *_pos) |
| 307 | { | 307 | { |
| 308 | (*_pos)++; | 308 | (*_pos)++; |
| 309 | return key_user_next((struct rb_node *) v); | 309 | return key_user_next((struct rb_node *)v); |
| 310 | } | 310 | } |
| 311 | 311 | ||
| 312 | static void proc_key_users_stop(struct seq_file *p, void *v) | 312 | static void proc_key_users_stop(struct seq_file *p, void *v) |