diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 21:10:18 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-31 21:10:18 -0400 |
| commit | 08615d7d85e5aa02c05bf6c4dde87d940e7f85f6 (patch) | |
| tree | 18906149d313d25914160aca21cedf54b3a7e818 /Documentation/CodingStyle | |
| parent | 9fdadb2cbaf4b482dfd6086e8bd3d2db071a1702 (diff) | |
| parent | 0a4dd35c67b144d8ef9432120105f1aab9293ee9 (diff) | |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge misc patches from Andrew Morton:
- the "misc" tree - stuff from all over the map
- checkpatch updates
- fatfs
- kmod changes
- procfs
- cpumask
- UML
- kexec
- mqueue
- rapidio
- pidns
- some checkpoint-restore feature work. Reluctantly. Most of it
delayed a release. I'm still rather worried that we don't have a
clear roadmap to completion for this work.
* emailed from Andrew Morton <akpm@linux-foundation.org>: (78 patches)
kconfig: update compression algorithm info
c/r: prctl: add ability to set new mm_struct::exe_file
c/r: prctl: extend PR_SET_MM to set up more mm_struct entries
c/r: procfs: add arg_start/end, env_start/end and exit_code members to /proc/$pid/stat
syscalls, x86: add __NR_kcmp syscall
fs, proc: introduce /proc/<pid>/task/<tid>/children entry
sysctl: make kernel.ns_last_pid control dependent on CHECKPOINT_RESTORE
aio/vfs: cleanup of rw_copy_check_uvector() and compat_rw_copy_check_uvector()
eventfd: change int to __u64 in eventfd_signal()
fs/nls: add Apple NLS
pidns: make killed children autoreap
pidns: use task_active_pid_ns in do_notify_parent
rapidio/tsi721: add DMA engine support
rapidio: add DMA engine support for RIO data transfers
ipc/mqueue: add rbtree node caching support
tools/selftests: add mq_perf_tests
ipc/mqueue: strengthen checks on mqueue creation
ipc/mqueue: correct mq_attr_ok test
ipc/mqueue: improve performance of send/recv
selftests: add mq_open_tests
...
Diffstat (limited to 'Documentation/CodingStyle')
| -rw-r--r-- | Documentation/CodingStyle | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/Documentation/CodingStyle b/Documentation/CodingStyle index c58b236bbe0..cb9258b8fd3 100644 --- a/Documentation/CodingStyle +++ b/Documentation/CodingStyle | |||
| @@ -671,8 +671,9 @@ ones already enabled by DEBUG. | |||
| 671 | Chapter 14: Allocating memory | 671 | Chapter 14: Allocating memory |
| 672 | 672 | ||
| 673 | The kernel provides the following general purpose memory allocators: | 673 | The kernel provides the following general purpose memory allocators: |
| 674 | kmalloc(), kzalloc(), kcalloc(), vmalloc(), and vzalloc(). Please refer to | 674 | kmalloc(), kzalloc(), kmalloc_array(), kcalloc(), vmalloc(), and |
| 675 | the API documentation for further information about them. | 675 | vzalloc(). Please refer to the API documentation for further information |
| 676 | about them. | ||
| 676 | 677 | ||
| 677 | The preferred form for passing a size of a struct is the following: | 678 | The preferred form for passing a size of a struct is the following: |
| 678 | 679 | ||
| @@ -686,6 +687,17 @@ Casting the return value which is a void pointer is redundant. The conversion | |||
| 686 | from void pointer to any other pointer type is guaranteed by the C programming | 687 | from void pointer to any other pointer type is guaranteed by the C programming |
| 687 | language. | 688 | language. |
| 688 | 689 | ||
| 690 | The preferred form for allocating an array is the following: | ||
| 691 | |||
| 692 | p = kmalloc_array(n, sizeof(...), ...); | ||
| 693 | |||
| 694 | The preferred form for allocating a zeroed array is the following: | ||
| 695 | |||
| 696 | p = kcalloc(n, sizeof(...), ...); | ||
| 697 | |||
| 698 | Both forms check for overflow on the allocation size n * sizeof(...), | ||
| 699 | and return NULL if that occurred. | ||
| 700 | |||
| 689 | 701 | ||
| 690 | Chapter 15: The inline disease | 702 | Chapter 15: The inline disease |
| 691 | 703 | ||
