diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 15:10:59 -0400 |
| commit | ad2c10f8f00d3fe2e37dd8a107e7cf4ac0459489 (patch) | |
| tree | 5571f6a5784f51efddf9c1ee0408894cd63a460f /ipc | |
| parent | 6b7839007098a6b5612d31690e11277d4242e6ae (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/mqueue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/mqueue.c b/ipc/mqueue.c index 0acf245f44..3a92601150 100644 --- a/ipc/mqueue.c +++ b/ipc/mqueue.c | |||
| @@ -69,7 +69,7 @@ struct mqueue_inode_info { | |||
| 69 | 69 | ||
| 70 | struct sigevent notify; | 70 | struct sigevent notify; |
| 71 | pid_t notify_owner; | 71 | pid_t notify_owner; |
| 72 | struct user_struct *user; /* user who created, for accouting */ | 72 | struct user_struct *user; /* user who created, for accounting */ |
| 73 | struct sock *notify_sock; | 73 | struct sock *notify_sock; |
| 74 | struct sk_buff *notify_cookie; | 74 | struct sk_buff *notify_cookie; |
| 75 | 75 | ||