diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 01:07:12 -0500 |
commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /ipc/util.c | |
parent | 193515d51ccb363165d6b09e9ba5c21089e34bad (diff) | |
parent | 330d57fb98a916fa8e1363846540dd420e99499a (diff) |
Merge branch 'master'
Diffstat (limited to 'ipc/util.c')
-rw-r--r-- | ipc/util.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ipc/util.c b/ipc/util.c index 10e836d0d89e..23f1cec150c1 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
@@ -410,7 +410,8 @@ void ipc_rcu_getref(void *ptr) | |||
410 | } | 410 | } |
411 | 411 | ||
412 | /** | 412 | /** |
413 | * ipc_schedule_free - free ipc + rcu space | 413 | * ipc_schedule_free - free ipc + rcu space |
414 | * @head: RCU callback structure for queued work | ||
414 | * | 415 | * |
415 | * Since RCU callback function is called in bh, | 416 | * Since RCU callback function is called in bh, |
416 | * we need to defer the vfree to schedule_work | 417 | * we need to defer the vfree to schedule_work |
@@ -427,10 +428,10 @@ static void ipc_schedule_free(struct rcu_head *head) | |||
427 | } | 428 | } |
428 | 429 | ||
429 | /** | 430 | /** |
430 | * ipc_immediate_free - free ipc + rcu space | 431 | * ipc_immediate_free - free ipc + rcu space |
431 | * | 432 | * @head: RCU callback structure that contains pointer to be freed |
432 | * Free from the RCU callback context | ||
433 | * | 433 | * |
434 | * Free from the RCU callback context | ||
434 | */ | 435 | */ |
435 | static void ipc_immediate_free(struct rcu_head *head) | 436 | static void ipc_immediate_free(struct rcu_head *head) |
436 | { | 437 | { |