diff options
author | Linus Torvalds | 2014-10-08 03:14:57 +0200 |
---|---|---|
committer | Linus Torvalds | 2014-10-08 03:14:57 +0200 |
commit | b6420ebd4a541455a75f9802f58cfa3ba0ea5390 (patch) | |
tree | 0abbd397c009a696bc8f33d36666aa95752caae8 /Documentation/mic/mpssd/mpssd.c | |
parent | Merge tag 'spi-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni... (diff) | |
parent | Documentation: fix broken v4l-utils URL (diff) | |
download | kernel-qcow2-linux-b6420ebd4a541455a75f9802f58cfa3ba0ea5390.tar.gz kernel-qcow2-linux-b6420ebd4a541455a75f9802f58cfa3ba0ea5390.tar.xz kernel-qcow2-linux-b6420ebd4a541455a75f9802f58cfa3ba0ea5390.zip |
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/mic/mpssd/mpssd.c')
-rw-r--r-- | Documentation/mic/mpssd/mpssd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/mic/mpssd/mpssd.c b/Documentation/mic/mpssd/mpssd.c index 4d17487d5ad9..3c5c379fc29d 100644 --- a/Documentation/mic/mpssd/mpssd.c +++ b/Documentation/mic/mpssd/mpssd.c @@ -41,6 +41,7 @@ #include "mpssd.h" #include <linux/mic_ioctl.h> #include <linux/mic_common.h> +#include <tools/endian.h> static void init_mic(struct mic_info *mic); @@ -1476,9 +1477,9 @@ set_cmdline(struct mic_info *mic) len = snprintf(buffer, PATH_MAX, "clocksource=tsc highres=off nohz=off "); - len += snprintf(buffer + len, PATH_MAX, + len += snprintf(buffer + len, PATH_MAX - len, "cpufreq_on;corec6_off;pc3_off;pc6_off "); - len += snprintf(buffer + len, PATH_MAX, + len += snprintf(buffer + len, PATH_MAX - len, "ifcfg=static;address,172.31.%d.1;netmask,255.255.255.0", mic->id); |