diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 21:16:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 21:16:26 -0400 |
| commit | 28596c9722289b2f98fa83a2e4351eb0a031b953 (patch) | |
| tree | f1a76a8a2604ac710bad28e3ad1b5976601c82d4 /ipc | |
| parent | b6420ebd4a541455a75f9802f58cfa3ba0ea5390 (diff) | |
| parent | 7bb38d57fd75f03753a5b362916c5bbde8290208 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull "trivial tree" updates from Jiri Kosina:
"Usual pile from trivial tree everyone is so eagerly waiting for"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
Remove MN10300_PROC_MN2WS0038
mei: fix comments
treewide: Fix typos in Kconfig
kprobes: update jprobe_example.c for do_fork() change
Documentation: change "&" to "and" in Documentation/applying-patches.txt
Documentation: remove obsolete pcmcia-cs from Changes
Documentation: update links in Changes
Documentation: Docbook: Fix generated DocBook/kernel-api.xml
score: Remove GENERIC_HAS_IOMAP
gpio: fix 'CONFIG_GPIO_IRQCHIP' comments
tty: doc: Fix grammar in serial/tty
dma-debug: modify check_for_stack output
treewide: fix errors in printk
genirq: fix reference in devm_request_threaded_irq comment
treewide: fix synchronize_rcu() in comments
checkstack.pl: port to AArch64
doc: queue-sysfs: minor fixes
init/do_mounts: better syntax description
MIPS: fix comment spelling
powerpc/simpleboot: fix comment
...
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/util.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipc/util.c b/ipc/util.c index 27d74e69fd57..d73b7af581e2 100644 --- a/ipc/util.c +++ b/ipc/util.c | |||
| @@ -309,7 +309,7 @@ int ipc_addid(struct ipc_ids *ids, struct kern_ipc_perm *new, int size) | |||
| 309 | /** | 309 | /** |
| 310 | * ipcget_new - create a new ipc object | 310 | * ipcget_new - create a new ipc object |
| 311 | * @ns: ipc namespace | 311 | * @ns: ipc namespace |
| 312 | * @ids: ipc identifer set | 312 | * @ids: ipc identifier set |
| 313 | * @ops: the actual creation routine to call | 313 | * @ops: the actual creation routine to call |
| 314 | * @params: its parameters | 314 | * @params: its parameters |
| 315 | * | 315 | * |
| @@ -363,7 +363,7 @@ static int ipc_check_perms(struct ipc_namespace *ns, | |||
| 363 | /** | 363 | /** |
| 364 | * ipcget_public - get an ipc object or create a new one | 364 | * ipcget_public - get an ipc object or create a new one |
| 365 | * @ns: ipc namespace | 365 | * @ns: ipc namespace |
| 366 | * @ids: ipc identifer set | 366 | * @ids: ipc identifier set |
| 367 | * @ops: the actual creation routine to call | 367 | * @ops: the actual creation routine to call |
| 368 | * @params: its parameters | 368 | * @params: its parameters |
| 369 | * | 369 | * |
| @@ -669,7 +669,7 @@ out: | |||
| 669 | 669 | ||
| 670 | /** | 670 | /** |
| 671 | * ipcget - Common sys_*get() code | 671 | * ipcget - Common sys_*get() code |
| 672 | * @ns: namsepace | 672 | * @ns: namespace |
| 673 | * @ids: ipc identifier set | 673 | * @ids: ipc identifier set |
| 674 | * @ops: operations to be called on ipc object creation, permission checks | 674 | * @ops: operations to be called on ipc object creation, permission checks |
| 675 | * and further checks | 675 | * and further checks |