diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 21:14:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-07 21:14:57 -0400 |
commit | b6420ebd4a541455a75f9802f58cfa3ba0ea5390 (patch) | |
tree | 0abbd397c009a696bc8f33d36666aa95752caae8 /Documentation/arm/SH-Mobile/vrl4.c | |
parent | d29010694c7e78dadc0e3862b29481e0c4b48f04 (diff) | |
parent | 0415447aa3b4decc2c05dfc45a0aa34a5eb4fc54 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc
Pull documentation updates from Jiri Kosina:
"Updates to kernel documentation.
I took this over (hopefully temporarily) from Randy who was not
willing to maintain it any longer. This pile mostly is a relay of
queue that Randy already had in his tree"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc:
Documentation: fix broken v4l-utils URL
Documentation: update include path for mpssd
Documentation: correct parameter error for dma_mapping_error
MAINTAINERS: update location of linux-doc tree
Documentation: remove networking/.gitignore
tools: add more endian.h macros
Make Documenation depend on headers_install
Docs: this_cpu_ops: remove redundant add forms
Documentation: disable vdso_test to avoid breakage with old glibc
Documentation: update vDSO makefile to build portable examples
Documentation: update .gitignore files
Documentation: support glibc versions without htole macros
v4l2-pci-skeleton: Only build if PCI is available
Documentation: fix misc. warnings
Documentation: make functions static to avoid prototype warnings
Documentation: add makefiles for more targets
Documentation: use subdir-y to avoid unnecessary built-in.o files
Diffstat (limited to 'Documentation/arm/SH-Mobile/vrl4.c')
-rw-r--r-- | Documentation/arm/SH-Mobile/vrl4.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/arm/SH-Mobile/vrl4.c b/Documentation/arm/SH-Mobile/vrl4.c index e8a191358ad2..f4cd8ad4e720 100644 --- a/Documentation/arm/SH-Mobile/vrl4.c +++ b/Documentation/arm/SH-Mobile/vrl4.c | |||
@@ -34,6 +34,7 @@ | |||
34 | #include <stdint.h> | 34 | #include <stdint.h> |
35 | #include <stdio.h> | 35 | #include <stdio.h> |
36 | #include <errno.h> | 36 | #include <errno.h> |
37 | #include <tools/endian.h> | ||
37 | 38 | ||
38 | struct hdr { | 39 | struct hdr { |
39 | uint32_t magic1; | 40 | uint32_t magic1; |
@@ -77,7 +78,7 @@ struct hdr { | |||
77 | 78 | ||
78 | #define ROUND_UP(x) ((x + ALIGN - 1) & ~(ALIGN - 1)) | 79 | #define ROUND_UP(x) ((x + ALIGN - 1) & ~(ALIGN - 1)) |
79 | 80 | ||
80 | ssize_t do_read(int fd, void *buf, size_t count) | 81 | static ssize_t do_read(int fd, void *buf, size_t count) |
81 | { | 82 | { |
82 | size_t offset = 0; | 83 | size_t offset = 0; |
83 | ssize_t l; | 84 | ssize_t l; |
@@ -98,7 +99,7 @@ ssize_t do_read(int fd, void *buf, size_t count) | |||
98 | return offset; | 99 | return offset; |
99 | } | 100 | } |
100 | 101 | ||
101 | ssize_t do_write(int fd, const void *buf, size_t count) | 102 | static ssize_t do_write(int fd, const void *buf, size_t count) |
102 | { | 103 | { |
103 | size_t offset = 0; | 104 | size_t offset = 0; |
104 | ssize_t l; | 105 | ssize_t l; |
@@ -117,7 +118,7 @@ ssize_t do_write(int fd, const void *buf, size_t count) | |||
117 | return offset; | 118 | return offset; |
118 | } | 119 | } |
119 | 120 | ||
120 | ssize_t write_zero(int fd, size_t len) | 121 | static ssize_t write_zero(int fd, size_t len) |
121 | { | 122 | { |
122 | size_t i = len; | 123 | size_t i = len; |
123 | 124 | ||