diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 06:11:02 -0400 |
| commit | 59e52534172d845ebffb0d7e85fc56fb7b857051 (patch) | |
| tree | 49552e03f1bdb413cd8b5f7542e91770688d7047 /Documentation/vm | |
| parent | 73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 (diff) | |
| parent | 0d89e54c8249645404283436d952afc261a04e1e (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits)
MAINTAINERS: linux-m32r is moderated for non-subscribers
linux@lists.openrisc.net is moderated for non-subscribers
Drop default from "DM365 codec select" choice
parisc: Kconfig: cleanup Kernel page size default
Kconfig: remove redundant CONFIG_ prefix on two symbols
cris: remove arch/cris/arch-v32/lib/nand_init.S
microblaze: add missing CONFIG_ prefixes
h8300: drop puzzling Kconfig dependencies
MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers
tty: drop superfluous dependency in Kconfig
ARM: mxc: fix Kconfig typo 'i.MX51'
Fix file references in Kconfig files
aic7xxx: fix Kconfig references to READMEs
Fix file references in drivers/ide/
thinkpad_acpi: Fix printk typo 'bluestooth'
bcmring: drop commented out line in Kconfig
btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888'
doc: raw1394: Trivial typo fix
CIFS: Don't free volume_info->UNC until we are entirely done with it.
treewide: Correct spelling of successfully in comments
...
Diffstat (limited to 'Documentation/vm')
| -rw-r--r-- | Documentation/vm/numa | 4 | ||||
| -rw-r--r-- | Documentation/vm/slub.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/vm/numa b/Documentation/vm/numa index a200a386429d..ade01274212d 100644 --- a/Documentation/vm/numa +++ b/Documentation/vm/numa | |||
| @@ -109,11 +109,11 @@ to improve NUMA locality using various CPU affinity command line interfaces, | |||
| 109 | such as taskset(1) and numactl(1), and program interfaces such as | 109 | such as taskset(1) and numactl(1), and program interfaces such as |
| 110 | sched_setaffinity(2). Further, one can modify the kernel's default local | 110 | sched_setaffinity(2). Further, one can modify the kernel's default local |
| 111 | allocation behavior using Linux NUMA memory policy. | 111 | allocation behavior using Linux NUMA memory policy. |
| 112 | [see Documentation/vm/numa_memory_policy.] | 112 | [see Documentation/vm/numa_memory_policy.txt.] |
| 113 | 113 | ||
| 114 | System administrators can restrict the CPUs and nodes' memories that a non- | 114 | System administrators can restrict the CPUs and nodes' memories that a non- |
| 115 | privileged user can specify in the scheduling or NUMA commands and functions | 115 | privileged user can specify in the scheduling or NUMA commands and functions |
| 116 | using control groups and CPUsets. [see Documentation/cgroups/CPUsets.txt] | 116 | using control groups and CPUsets. [see Documentation/cgroups/cpusets.txt] |
| 117 | 117 | ||
| 118 | On architectures that do not hide memoryless nodes, Linux will include only | 118 | On architectures that do not hide memoryless nodes, Linux will include only |
| 119 | zones [nodes] with memory in the zonelists. This means that for a memoryless | 119 | zones [nodes] with memory in the zonelists. This means that for a memoryless |
diff --git a/Documentation/vm/slub.txt b/Documentation/vm/slub.txt index 07375e73981a..f464f47bc60d 100644 --- a/Documentation/vm/slub.txt +++ b/Documentation/vm/slub.txt | |||
| @@ -17,7 +17,7 @@ data and perform operation on the slabs. By default slabinfo only lists | |||
| 17 | slabs that have data in them. See "slabinfo -h" for more options when | 17 | slabs that have data in them. See "slabinfo -h" for more options when |
| 18 | running the command. slabinfo can be compiled with | 18 | running the command. slabinfo can be compiled with |
| 19 | 19 | ||
| 20 | gcc -o slabinfo Documentation/vm/slabinfo.c | 20 | gcc -o slabinfo tools/slub/slabinfo.c |
| 21 | 21 | ||
| 22 | Some of the modes of operation of slabinfo require that slub debugging | 22 | Some of the modes of operation of slabinfo require that slub debugging |
| 23 | be enabled on the command line. F.e. no tracking information will be | 23 | be enabled on the command line. F.e. no tracking information will be |