diff options
Diffstat (limited to 'ipc/util.c')
-rw-r--r-- | ipc/util.c | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/ipc/util.c b/ipc/util.c index a9b7a227b8d4..0c97cb746160 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
@@ -150,7 +150,7 @@ void free_ipc_ns(struct kref *kref) | |||
150 | * ipc_init - initialise IPC subsystem | 150 | * ipc_init - initialise IPC subsystem |
151 | * | 151 | * |
152 | * The various system5 IPC resources (semaphores, messages and shared | 152 | * The various system5 IPC resources (semaphores, messages and shared |
153 | * memory are initialised | 153 | * memory) are initialised |
154 | */ | 154 | */ |
155 | 155 | ||
156 | static int __init ipc_init(void) | 156 | static int __init ipc_init(void) |
@@ -207,8 +207,7 @@ void __ipc_init ipc_init_ids(struct ipc_ids* ids, int size) | |||
207 | #ifdef CONFIG_PROC_FS | 207 | #ifdef CONFIG_PROC_FS |
208 | static struct file_operations sysvipc_proc_fops; | 208 | static struct file_operations sysvipc_proc_fops; |
209 | /** | 209 | /** |
210 | * ipc_init_proc_interface - Create a proc interface for sysipc types | 210 | * ipc_init_proc_interface - Create a proc interface for sysipc types using a seq_file interface. |
211 | * using a seq_file interface. | ||
212 | * @path: Path in procfs | 211 | * @path: Path in procfs |
213 | * @header: Banner to be printed at the beginning of the file. | 212 | * @header: Banner to be printed at the beginning of the file. |
214 | * @ids: ipc id table to iterate. | 213 | * @ids: ipc id table to iterate. |
@@ -417,7 +416,7 @@ void* ipc_alloc(int size) | |||
417 | * @ptr: pointer returned by ipc_alloc | 416 | * @ptr: pointer returned by ipc_alloc |
418 | * @size: size of block | 417 | * @size: size of block |
419 | * | 418 | * |
420 | * Free a block created with ipc_alloc. The caller must know the size | 419 | * Free a block created with ipc_alloc(). The caller must know the size |
421 | * used in the allocation call. | 420 | * used in the allocation call. |
422 | */ | 421 | */ |
423 | 422 | ||
@@ -524,7 +523,7 @@ static void ipc_do_vfree(struct work_struct *work) | |||
524 | * @head: RCU callback structure for queued work | 523 | * @head: RCU callback structure for queued work |
525 | * | 524 | * |
526 | * Since RCU callback function is called in bh, | 525 | * Since RCU callback function is called in bh, |
527 | * we need to defer the vfree to schedule_work | 526 | * we need to defer the vfree to schedule_work(). |
528 | */ | 527 | */ |
529 | static void ipc_schedule_free(struct rcu_head *head) | 528 | static void ipc_schedule_free(struct rcu_head *head) |
530 | { | 529 | { |
@@ -541,7 +540,7 @@ static void ipc_schedule_free(struct rcu_head *head) | |||
541 | * ipc_immediate_free - free ipc + rcu space | 540 | * ipc_immediate_free - free ipc + rcu space |
542 | * @head: RCU callback structure that contains pointer to be freed | 541 | * @head: RCU callback structure that contains pointer to be freed |
543 | * | 542 | * |
544 | * Free from the RCU callback context | 543 | * Free from the RCU callback context. |
545 | */ | 544 | */ |
546 | static void ipc_immediate_free(struct rcu_head *head) | 545 | static void ipc_immediate_free(struct rcu_head *head) |
547 | { | 546 | { |
@@ -603,8 +602,8 @@ int ipcperms (struct kern_ipc_perm *ipcp, short flag) | |||
603 | * @in: kernel permissions | 602 | * @in: kernel permissions |
604 | * @out: new style IPC permissions | 603 | * @out: new style IPC permissions |
605 | * | 604 | * |
606 | * Turn the kernel object 'in' into a set of permissions descriptions | 605 | * Turn the kernel object @in into a set of permissions descriptions |
607 | * for returning to userspace (out). | 606 | * for returning to userspace (@out). |
608 | */ | 607 | */ |
609 | 608 | ||
610 | 609 | ||
@@ -624,8 +623,8 @@ void kernel_to_ipc64_perm (struct kern_ipc_perm *in, struct ipc64_perm *out) | |||
624 | * @in: new style IPC permissions | 623 | * @in: new style IPC permissions |
625 | * @out: old style IPC permissions | 624 | * @out: old style IPC permissions |
626 | * | 625 | * |
627 | * Turn the new style permissions object in into a compatibility | 626 | * Turn the new style permissions object @in into a compatibility |
628 | * object and store it into the 'out' pointer. | 627 | * object and store it into the @out pointer. |
629 | */ | 628 | */ |
630 | 629 | ||
631 | void ipc64_perm_to_ipc_perm (struct ipc64_perm *in, struct ipc_perm *out) | 630 | void ipc64_perm_to_ipc_perm (struct ipc64_perm *in, struct ipc_perm *out) |
@@ -722,7 +721,7 @@ int ipc_checkid(struct ipc_ids* ids, struct kern_ipc_perm* ipcp, int uid) | |||
722 | * @cmd: pointer to command | 721 | * @cmd: pointer to command |
723 | * | 722 | * |
724 | * Return IPC_64 for new style IPC and IPC_OLD for old style IPC. | 723 | * Return IPC_64 for new style IPC and IPC_OLD for old style IPC. |
725 | * The cmd value is turned from an encoding command and version into | 724 | * The @cmd value is turned from an encoding command and version into |
726 | * just the command code. | 725 | * just the command code. |
727 | */ | 726 | */ |
728 | 727 | ||