diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/arm/SA1100/FreeBird | 4 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 2 | ||||
-rw-r--r-- | Documentation/vm/numa_memory_policy.txt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/arm/SA1100/FreeBird b/Documentation/arm/SA1100/FreeBird index fb23b770aaf4..ab9193663b2b 100644 --- a/Documentation/arm/SA1100/FreeBird +++ b/Documentation/arm/SA1100/FreeBird | |||
@@ -1,6 +1,6 @@ | |||
1 | Freebird-1.1 is produced by Legned(C) ,Inc. | 1 | Freebird-1.1 is produced by Legend(C), Inc. |
2 | http://web.archive.org/web/*/http://www.legend.com.cn | 2 | http://web.archive.org/web/*/http://www.legend.com.cn |
3 | and software/linux mainatined by Coventive(C),Inc. | 3 | and software/linux maintained by Coventive(C), Inc. |
4 | (http://www.coventive.com) | 4 | (http://www.coventive.com) |
5 | 5 | ||
6 | Based on the Nicolas's strongarm kernel tree. | 6 | Based on the Nicolas's strongarm kernel tree. |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 9533af74a127..0b6815504e6d 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -1724,7 +1724,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1724 | norandmaps Don't use address space randomization. Equivalent to | 1724 | norandmaps Don't use address space randomization. Equivalent to |
1725 | echo 0 > /proc/sys/kernel/randomize_va_space | 1725 | echo 0 > /proc/sys/kernel/randomize_va_space |
1726 | 1726 | ||
1727 | noreplace-paravirt [X86-32,PV_OPS] Don't patch paravirt_ops | 1727 | noreplace-paravirt [X86,IA-64,PV_OPS] Don't patch paravirt_ops |
1728 | 1728 | ||
1729 | noreplace-smp [X86-32,SMP] Don't replace SMP instructions | 1729 | noreplace-smp [X86-32,SMP] Don't replace SMP instructions |
1730 | with UP alternatives | 1730 | with UP alternatives |
diff --git a/Documentation/vm/numa_memory_policy.txt b/Documentation/vm/numa_memory_policy.txt index 6690fc34ef6d..4e7da6543424 100644 --- a/Documentation/vm/numa_memory_policy.txt +++ b/Documentation/vm/numa_memory_policy.txt | |||
@@ -424,7 +424,7 @@ a command line tool, numactl(8), exists that allows one to: | |||
424 | 424 | ||
425 | + set the shared policy for a shared memory segment via mbind(2) | 425 | + set the shared policy for a shared memory segment via mbind(2) |
426 | 426 | ||
427 | The numactl(8) tool is packages with the run-time version of the library | 427 | The numactl(8) tool is packaged with the run-time version of the library |
428 | containing the memory policy system call wrappers. Some distributions | 428 | containing the memory policy system call wrappers. Some distributions |
429 | package the headers and compile-time libraries in a separate development | 429 | package the headers and compile-time libraries in a separate development |
430 | package. | 430 | package. |