diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/cgroups/cpusets.txt | 17 | ||||
-rw-r--r-- | Documentation/cgroups/memory.txt | 5 | ||||
-rw-r--r-- | Documentation/device-mapper/dm-crypt.txt | 2 | ||||
-rw-r--r-- | Documentation/filesystems/romfs.txt | 3 | ||||
-rw-r--r-- | Documentation/kbuild/kbuild.txt | 2 | ||||
-rw-r--r-- | Documentation/kbuild/makefiles.txt | 3 | ||||
-rw-r--r-- | Documentation/kvm/api.txt | 96 | ||||
-rw-r--r-- | Documentation/sysctl/kernel.txt | 2 | ||||
-rw-r--r-- | Documentation/vm/unevictable-lru.txt | 3 |
9 files changed, 67 insertions, 66 deletions
diff --git a/Documentation/cgroups/cpusets.txt b/Documentation/cgroups/cpusets.txt index 5d0d5692a365..98a30829af7a 100644 --- a/Documentation/cgroups/cpusets.txt +++ b/Documentation/cgroups/cpusets.txt | |||
@@ -693,7 +693,7 @@ There are ways to query or modify cpusets: | |||
693 | - via the C library libcgroup. | 693 | - via the C library libcgroup. |
694 | (http://sourceforge.net/projects/libcg/) | 694 | (http://sourceforge.net/projects/libcg/) |
695 | - via the python application cset. | 695 | - via the python application cset. |
696 | (http://developer.novell.com/wiki/index.php/Cpuset) | 696 | (http://code.google.com/p/cpuset/) |
697 | 697 | ||
698 | The sched_setaffinity calls can also be done at the shell prompt using | 698 | The sched_setaffinity calls can also be done at the shell prompt using |
699 | SGI's runon or Robert Love's taskset. The mbind and set_mempolicy | 699 | SGI's runon or Robert Love's taskset. The mbind and set_mempolicy |
@@ -725,13 +725,14 @@ Now you want to do something with this cpuset. | |||
725 | 725 | ||
726 | In this directory you can find several files: | 726 | In this directory you can find several files: |
727 | # ls | 727 | # ls |
728 | cpuset.cpu_exclusive cpuset.memory_spread_slab | 728 | cgroup.clone_children cpuset.memory_pressure |
729 | cpuset.cpus cpuset.mems | 729 | cgroup.event_control cpuset.memory_spread_page |
730 | cpuset.mem_exclusive cpuset.sched_load_balance | 730 | cgroup.procs cpuset.memory_spread_slab |
731 | cpuset.mem_hardwall cpuset.sched_relax_domain_level | 731 | cpuset.cpu_exclusive cpuset.mems |
732 | cpuset.memory_migrate notify_on_release | 732 | cpuset.cpus cpuset.sched_load_balance |
733 | cpuset.memory_pressure tasks | 733 | cpuset.mem_exclusive cpuset.sched_relax_domain_level |
734 | cpuset.memory_spread_page | 734 | cpuset.mem_hardwall notify_on_release |
735 | cpuset.memory_migrate tasks | ||
735 | 736 | ||
736 | Reading them will give you information about the state of this cpuset: | 737 | Reading them will give you information about the state of this cpuset: |
737 | the CPUs and Memory Nodes it can use, the processes that are using | 738 | the CPUs and Memory Nodes it can use, the processes that are using |
diff --git a/Documentation/cgroups/memory.txt b/Documentation/cgroups/memory.txt index 7781857dc940..b6ed61c95856 100644 --- a/Documentation/cgroups/memory.txt +++ b/Documentation/cgroups/memory.txt | |||
@@ -485,8 +485,9 @@ The feature can be disabled by | |||
485 | 485 | ||
486 | # echo 0 > memory.use_hierarchy | 486 | # echo 0 > memory.use_hierarchy |
487 | 487 | ||
488 | NOTE1: Enabling/disabling will fail if the cgroup already has other | 488 | NOTE1: Enabling/disabling will fail if either the cgroup already has other |
489 | cgroups created below it. | 489 | cgroups created below it, or if the parent cgroup has use_hierarchy |
490 | enabled. | ||
490 | 491 | ||
491 | NOTE2: When panic_on_oom is set to "2", the whole system will panic in | 492 | NOTE2: When panic_on_oom is set to "2", the whole system will panic in |
492 | case of an OOM event in any cgroup. | 493 | case of an OOM event in any cgroup. |
diff --git a/Documentation/device-mapper/dm-crypt.txt b/Documentation/device-mapper/dm-crypt.txt index 59293ac4a5d0..6b5c42dbbe84 100644 --- a/Documentation/device-mapper/dm-crypt.txt +++ b/Documentation/device-mapper/dm-crypt.txt | |||
@@ -41,7 +41,7 @@ Example scripts | |||
41 | =============== | 41 | =============== |
42 | LUKS (Linux Unified Key Setup) is now the preferred way to set up disk | 42 | LUKS (Linux Unified Key Setup) is now the preferred way to set up disk |
43 | encryption with dm-crypt using the 'cryptsetup' utility, see | 43 | encryption with dm-crypt using the 'cryptsetup' utility, see |
44 | http://clemens.endorphin.org/cryptography | 44 | http://code.google.com/p/cryptsetup/ |
45 | 45 | ||
46 | [[ | 46 | [[ |
47 | #!/bin/sh | 47 | #!/bin/sh |
diff --git a/Documentation/filesystems/romfs.txt b/Documentation/filesystems/romfs.txt index 2d2a7b2a16b9..e2b07cc9120a 100644 --- a/Documentation/filesystems/romfs.txt +++ b/Documentation/filesystems/romfs.txt | |||
@@ -17,8 +17,7 @@ comparison, an actual rescue disk used up 3202 blocks with ext2, while | |||
17 | with romfs, it needed 3079 blocks. | 17 | with romfs, it needed 3079 blocks. |
18 | 18 | ||
19 | To create such a file system, you'll need a user program named | 19 | To create such a file system, you'll need a user program named |
20 | genromfs. It is available via anonymous ftp on sunsite.unc.edu and | 20 | genromfs. It is available on http://romfs.sourceforge.net/ |
21 | its mirrors, in the /pub/Linux/system/recovery/ directory. | ||
22 | 21 | ||
23 | As the name suggests, romfs could be also used (space-efficiently) on | 22 | As the name suggests, romfs could be also used (space-efficiently) on |
24 | various read-only media, like (E)EPROM disks if someone will have the | 23 | various read-only media, like (E)EPROM disks if someone will have the |
diff --git a/Documentation/kbuild/kbuild.txt b/Documentation/kbuild/kbuild.txt index 4a990317b84a..8f63b224ab09 100644 --- a/Documentation/kbuild/kbuild.txt +++ b/Documentation/kbuild/kbuild.txt | |||
@@ -146,7 +146,7 @@ INSTALL_MOD_STRIP | |||
146 | INSTALL_MOD_STRIP, if defined, will cause modules to be | 146 | INSTALL_MOD_STRIP, if defined, will cause modules to be |
147 | stripped after they are installed. If INSTALL_MOD_STRIP is '1', then | 147 | stripped after they are installed. If INSTALL_MOD_STRIP is '1', then |
148 | the default option --strip-debug will be used. Otherwise, | 148 | the default option --strip-debug will be used. Otherwise, |
149 | INSTALL_MOD_STRIP will used as the options to the strip command. | 149 | INSTALL_MOD_STRIP value will be used as the options to the strip command. |
150 | 150 | ||
151 | INSTALL_FW_PATH | 151 | INSTALL_FW_PATH |
152 | -------------------------------------------------- | 152 | -------------------------------------------------- |
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt index 86e3cd0d26a0..5d145bb443c0 100644 --- a/Documentation/kbuild/makefiles.txt +++ b/Documentation/kbuild/makefiles.txt | |||
@@ -1325,7 +1325,8 @@ The top Makefile exports the following variables: | |||
1325 | If this variable is specified, will cause modules to be stripped | 1325 | If this variable is specified, will cause modules to be stripped |
1326 | after they are installed. If INSTALL_MOD_STRIP is '1', then the | 1326 | after they are installed. If INSTALL_MOD_STRIP is '1', then the |
1327 | default option --strip-debug will be used. Otherwise, | 1327 | default option --strip-debug will be used. Otherwise, |
1328 | INSTALL_MOD_STRIP will used as the option(s) to the strip command. | 1328 | INSTALL_MOD_STRIP value will be used as the option(s) to the strip |
1329 | command. | ||
1329 | 1330 | ||
1330 | 1331 | ||
1331 | === 9 Makefile language | 1332 | === 9 Makefile language |
diff --git a/Documentation/kvm/api.txt b/Documentation/kvm/api.txt index ad85797c1cf0..9bef4e4cec50 100644 --- a/Documentation/kvm/api.txt +++ b/Documentation/kvm/api.txt | |||
@@ -166,7 +166,7 @@ Returns: 0 on success, -1 on error | |||
166 | 166 | ||
167 | This ioctl is obsolete and has been removed. | 167 | This ioctl is obsolete and has been removed. |
168 | 168 | ||
169 | 4.6 KVM_CREATE_VCPU | 169 | 4.7 KVM_CREATE_VCPU |
170 | 170 | ||
171 | Capability: basic | 171 | Capability: basic |
172 | Architectures: all | 172 | Architectures: all |
@@ -177,7 +177,7 @@ Returns: vcpu fd on success, -1 on error | |||
177 | This API adds a vcpu to a virtual machine. The vcpu id is a small integer | 177 | This API adds a vcpu to a virtual machine. The vcpu id is a small integer |
178 | in the range [0, max_vcpus). | 178 | in the range [0, max_vcpus). |
179 | 179 | ||
180 | 4.7 KVM_GET_DIRTY_LOG (vm ioctl) | 180 | 4.8 KVM_GET_DIRTY_LOG (vm ioctl) |
181 | 181 | ||
182 | Capability: basic | 182 | Capability: basic |
183 | Architectures: x86 | 183 | Architectures: x86 |
@@ -200,7 +200,7 @@ since the last call to this ioctl. Bit 0 is the first page in the | |||
200 | memory slot. Ensure the entire structure is cleared to avoid padding | 200 | memory slot. Ensure the entire structure is cleared to avoid padding |
201 | issues. | 201 | issues. |
202 | 202 | ||
203 | 4.8 KVM_SET_MEMORY_ALIAS | 203 | 4.9 KVM_SET_MEMORY_ALIAS |
204 | 204 | ||
205 | Capability: basic | 205 | Capability: basic |
206 | Architectures: x86 | 206 | Architectures: x86 |
@@ -210,7 +210,7 @@ Returns: 0 (success), -1 (error) | |||
210 | 210 | ||
211 | This ioctl is obsolete and has been removed. | 211 | This ioctl is obsolete and has been removed. |
212 | 212 | ||
213 | 4.9 KVM_RUN | 213 | 4.10 KVM_RUN |
214 | 214 | ||
215 | Capability: basic | 215 | Capability: basic |
216 | Architectures: all | 216 | Architectures: all |
@@ -226,7 +226,7 @@ obtained by mmap()ing the vcpu fd at offset 0, with the size given by | |||
226 | KVM_GET_VCPU_MMAP_SIZE. The parameter block is formatted as a 'struct | 226 | KVM_GET_VCPU_MMAP_SIZE. The parameter block is formatted as a 'struct |
227 | kvm_run' (see below). | 227 | kvm_run' (see below). |
228 | 228 | ||
229 | 4.10 KVM_GET_REGS | 229 | 4.11 KVM_GET_REGS |
230 | 230 | ||
231 | Capability: basic | 231 | Capability: basic |
232 | Architectures: all | 232 | Architectures: all |
@@ -246,7 +246,7 @@ struct kvm_regs { | |||
246 | __u64 rip, rflags; | 246 | __u64 rip, rflags; |
247 | }; | 247 | }; |
248 | 248 | ||
249 | 4.11 KVM_SET_REGS | 249 | 4.12 KVM_SET_REGS |
250 | 250 | ||
251 | Capability: basic | 251 | Capability: basic |
252 | Architectures: all | 252 | Architectures: all |
@@ -258,7 +258,7 @@ Writes the general purpose registers into the vcpu. | |||
258 | 258 | ||
259 | See KVM_GET_REGS for the data structure. | 259 | See KVM_GET_REGS for the data structure. |
260 | 260 | ||
261 | 4.12 KVM_GET_SREGS | 261 | 4.13 KVM_GET_SREGS |
262 | 262 | ||
263 | Capability: basic | 263 | Capability: basic |
264 | Architectures: x86 | 264 | Architectures: x86 |
@@ -283,7 +283,7 @@ interrupt_bitmap is a bitmap of pending external interrupts. At most | |||
283 | one bit may be set. This interrupt has been acknowledged by the APIC | 283 | one bit may be set. This interrupt has been acknowledged by the APIC |
284 | but not yet injected into the cpu core. | 284 | but not yet injected into the cpu core. |
285 | 285 | ||
286 | 4.13 KVM_SET_SREGS | 286 | 4.14 KVM_SET_SREGS |
287 | 287 | ||
288 | Capability: basic | 288 | Capability: basic |
289 | Architectures: x86 | 289 | Architectures: x86 |
@@ -294,7 +294,7 @@ Returns: 0 on success, -1 on error | |||
294 | Writes special registers into the vcpu. See KVM_GET_SREGS for the | 294 | Writes special registers into the vcpu. See KVM_GET_SREGS for the |
295 | data structures. | 295 | data structures. |
296 | 296 | ||
297 | 4.14 KVM_TRANSLATE | 297 | 4.15 KVM_TRANSLATE |
298 | 298 | ||
299 | Capability: basic | 299 | Capability: basic |
300 | Architectures: x86 | 300 | Architectures: x86 |
@@ -317,7 +317,7 @@ struct kvm_translation { | |||
317 | __u8 pad[5]; | 317 | __u8 pad[5]; |
318 | }; | 318 | }; |
319 | 319 | ||
320 | 4.15 KVM_INTERRUPT | 320 | 4.16 KVM_INTERRUPT |
321 | 321 | ||
322 | Capability: basic | 322 | Capability: basic |
323 | Architectures: x86, ppc | 323 | Architectures: x86, ppc |
@@ -365,7 +365,7 @@ c) KVM_INTERRUPT_SET_LEVEL | |||
365 | Note that any value for 'irq' other than the ones stated above is invalid | 365 | Note that any value for 'irq' other than the ones stated above is invalid |
366 | and incurs unexpected behavior. | 366 | and incurs unexpected behavior. |
367 | 367 | ||
368 | 4.16 KVM_DEBUG_GUEST | 368 | 4.17 KVM_DEBUG_GUEST |
369 | 369 | ||
370 | Capability: basic | 370 | Capability: basic |
371 | Architectures: none | 371 | Architectures: none |
@@ -375,7 +375,7 @@ Returns: -1 on error | |||
375 | 375 | ||
376 | Support for this has been removed. Use KVM_SET_GUEST_DEBUG instead. | 376 | Support for this has been removed. Use KVM_SET_GUEST_DEBUG instead. |
377 | 377 | ||
378 | 4.17 KVM_GET_MSRS | 378 | 4.18 KVM_GET_MSRS |
379 | 379 | ||
380 | Capability: basic | 380 | Capability: basic |
381 | Architectures: x86 | 381 | Architectures: x86 |
@@ -403,7 +403,7 @@ Application code should set the 'nmsrs' member (which indicates the | |||
403 | size of the entries array) and the 'index' member of each array entry. | 403 | size of the entries array) and the 'index' member of each array entry. |
404 | kvm will fill in the 'data' member. | 404 | kvm will fill in the 'data' member. |
405 | 405 | ||
406 | 4.18 KVM_SET_MSRS | 406 | 4.19 KVM_SET_MSRS |
407 | 407 | ||
408 | Capability: basic | 408 | Capability: basic |
409 | Architectures: x86 | 409 | Architectures: x86 |
@@ -418,7 +418,7 @@ Application code should set the 'nmsrs' member (which indicates the | |||
418 | size of the entries array), and the 'index' and 'data' members of each | 418 | size of the entries array), and the 'index' and 'data' members of each |
419 | array entry. | 419 | array entry. |
420 | 420 | ||
421 | 4.19 KVM_SET_CPUID | 421 | 4.20 KVM_SET_CPUID |
422 | 422 | ||
423 | Capability: basic | 423 | Capability: basic |
424 | Architectures: x86 | 424 | Architectures: x86 |
@@ -446,7 +446,7 @@ struct kvm_cpuid { | |||
446 | struct kvm_cpuid_entry entries[0]; | 446 | struct kvm_cpuid_entry entries[0]; |
447 | }; | 447 | }; |
448 | 448 | ||
449 | 4.20 KVM_SET_SIGNAL_MASK | 449 | 4.21 KVM_SET_SIGNAL_MASK |
450 | 450 | ||
451 | Capability: basic | 451 | Capability: basic |
452 | Architectures: x86 | 452 | Architectures: x86 |
@@ -468,7 +468,7 @@ struct kvm_signal_mask { | |||
468 | __u8 sigset[0]; | 468 | __u8 sigset[0]; |
469 | }; | 469 | }; |
470 | 470 | ||
471 | 4.21 KVM_GET_FPU | 471 | 4.22 KVM_GET_FPU |
472 | 472 | ||
473 | Capability: basic | 473 | Capability: basic |
474 | Architectures: x86 | 474 | Architectures: x86 |
@@ -493,7 +493,7 @@ struct kvm_fpu { | |||
493 | __u32 pad2; | 493 | __u32 pad2; |
494 | }; | 494 | }; |
495 | 495 | ||
496 | 4.22 KVM_SET_FPU | 496 | 4.23 KVM_SET_FPU |
497 | 497 | ||
498 | Capability: basic | 498 | Capability: basic |
499 | Architectures: x86 | 499 | Architectures: x86 |
@@ -518,7 +518,7 @@ struct kvm_fpu { | |||
518 | __u32 pad2; | 518 | __u32 pad2; |
519 | }; | 519 | }; |
520 | 520 | ||
521 | 4.23 KVM_CREATE_IRQCHIP | 521 | 4.24 KVM_CREATE_IRQCHIP |
522 | 522 | ||
523 | Capability: KVM_CAP_IRQCHIP | 523 | Capability: KVM_CAP_IRQCHIP |
524 | Architectures: x86, ia64 | 524 | Architectures: x86, ia64 |
@@ -531,7 +531,7 @@ ioapic, a virtual PIC (two PICs, nested), and sets up future vcpus to have a | |||
531 | local APIC. IRQ routing for GSIs 0-15 is set to both PIC and IOAPIC; GSI 16-23 | 531 | local APIC. IRQ routing for GSIs 0-15 is set to both PIC and IOAPIC; GSI 16-23 |
532 | only go to the IOAPIC. On ia64, a IOSAPIC is created. | 532 | only go to the IOAPIC. On ia64, a IOSAPIC is created. |
533 | 533 | ||
534 | 4.24 KVM_IRQ_LINE | 534 | 4.25 KVM_IRQ_LINE |
535 | 535 | ||
536 | Capability: KVM_CAP_IRQCHIP | 536 | Capability: KVM_CAP_IRQCHIP |
537 | Architectures: x86, ia64 | 537 | Architectures: x86, ia64 |
@@ -552,7 +552,7 @@ struct kvm_irq_level { | |||
552 | __u32 level; /* 0 or 1 */ | 552 | __u32 level; /* 0 or 1 */ |
553 | }; | 553 | }; |
554 | 554 | ||
555 | 4.25 KVM_GET_IRQCHIP | 555 | 4.26 KVM_GET_IRQCHIP |
556 | 556 | ||
557 | Capability: KVM_CAP_IRQCHIP | 557 | Capability: KVM_CAP_IRQCHIP |
558 | Architectures: x86, ia64 | 558 | Architectures: x86, ia64 |
@@ -573,7 +573,7 @@ struct kvm_irqchip { | |||
573 | } chip; | 573 | } chip; |
574 | }; | 574 | }; |
575 | 575 | ||
576 | 4.26 KVM_SET_IRQCHIP | 576 | 4.27 KVM_SET_IRQCHIP |
577 | 577 | ||
578 | Capability: KVM_CAP_IRQCHIP | 578 | Capability: KVM_CAP_IRQCHIP |
579 | Architectures: x86, ia64 | 579 | Architectures: x86, ia64 |
@@ -594,7 +594,7 @@ struct kvm_irqchip { | |||
594 | } chip; | 594 | } chip; |
595 | }; | 595 | }; |
596 | 596 | ||
597 | 4.27 KVM_XEN_HVM_CONFIG | 597 | 4.28 KVM_XEN_HVM_CONFIG |
598 | 598 | ||
599 | Capability: KVM_CAP_XEN_HVM | 599 | Capability: KVM_CAP_XEN_HVM |
600 | Architectures: x86 | 600 | Architectures: x86 |
@@ -618,7 +618,7 @@ struct kvm_xen_hvm_config { | |||
618 | __u8 pad2[30]; | 618 | __u8 pad2[30]; |
619 | }; | 619 | }; |
620 | 620 | ||
621 | 4.27 KVM_GET_CLOCK | 621 | 4.29 KVM_GET_CLOCK |
622 | 622 | ||
623 | Capability: KVM_CAP_ADJUST_CLOCK | 623 | Capability: KVM_CAP_ADJUST_CLOCK |
624 | Architectures: x86 | 624 | Architectures: x86 |
@@ -636,7 +636,7 @@ struct kvm_clock_data { | |||
636 | __u32 pad[9]; | 636 | __u32 pad[9]; |
637 | }; | 637 | }; |
638 | 638 | ||
639 | 4.28 KVM_SET_CLOCK | 639 | 4.30 KVM_SET_CLOCK |
640 | 640 | ||
641 | Capability: KVM_CAP_ADJUST_CLOCK | 641 | Capability: KVM_CAP_ADJUST_CLOCK |
642 | Architectures: x86 | 642 | Architectures: x86 |
@@ -654,7 +654,7 @@ struct kvm_clock_data { | |||
654 | __u32 pad[9]; | 654 | __u32 pad[9]; |
655 | }; | 655 | }; |
656 | 656 | ||
657 | 4.29 KVM_GET_VCPU_EVENTS | 657 | 4.31 KVM_GET_VCPU_EVENTS |
658 | 658 | ||
659 | Capability: KVM_CAP_VCPU_EVENTS | 659 | Capability: KVM_CAP_VCPU_EVENTS |
660 | Extended by: KVM_CAP_INTR_SHADOW | 660 | Extended by: KVM_CAP_INTR_SHADOW |
@@ -693,7 +693,7 @@ struct kvm_vcpu_events { | |||
693 | KVM_VCPUEVENT_VALID_SHADOW may be set in the flags field to signal that | 693 | KVM_VCPUEVENT_VALID_SHADOW may be set in the flags field to signal that |
694 | interrupt.shadow contains a valid state. Otherwise, this field is undefined. | 694 | interrupt.shadow contains a valid state. Otherwise, this field is undefined. |
695 | 695 | ||
696 | 4.30 KVM_SET_VCPU_EVENTS | 696 | 4.32 KVM_SET_VCPU_EVENTS |
697 | 697 | ||
698 | Capability: KVM_CAP_VCPU_EVENTS | 698 | Capability: KVM_CAP_VCPU_EVENTS |
699 | Extended by: KVM_CAP_INTR_SHADOW | 699 | Extended by: KVM_CAP_INTR_SHADOW |
@@ -719,7 +719,7 @@ If KVM_CAP_INTR_SHADOW is available, KVM_VCPUEVENT_VALID_SHADOW can be set in | |||
719 | the flags field to signal that interrupt.shadow contains a valid state and | 719 | the flags field to signal that interrupt.shadow contains a valid state and |
720 | shall be written into the VCPU. | 720 | shall be written into the VCPU. |
721 | 721 | ||
722 | 4.32 KVM_GET_DEBUGREGS | 722 | 4.33 KVM_GET_DEBUGREGS |
723 | 723 | ||
724 | Capability: KVM_CAP_DEBUGREGS | 724 | Capability: KVM_CAP_DEBUGREGS |
725 | Architectures: x86 | 725 | Architectures: x86 |
@@ -737,7 +737,7 @@ struct kvm_debugregs { | |||
737 | __u64 reserved[9]; | 737 | __u64 reserved[9]; |
738 | }; | 738 | }; |
739 | 739 | ||
740 | 4.33 KVM_SET_DEBUGREGS | 740 | 4.34 KVM_SET_DEBUGREGS |
741 | 741 | ||
742 | Capability: KVM_CAP_DEBUGREGS | 742 | Capability: KVM_CAP_DEBUGREGS |
743 | Architectures: x86 | 743 | Architectures: x86 |
@@ -750,7 +750,7 @@ Writes debug registers into the vcpu. | |||
750 | See KVM_GET_DEBUGREGS for the data structure. The flags field is unused | 750 | See KVM_GET_DEBUGREGS for the data structure. The flags field is unused |
751 | yet and must be cleared on entry. | 751 | yet and must be cleared on entry. |
752 | 752 | ||
753 | 4.34 KVM_SET_USER_MEMORY_REGION | 753 | 4.35 KVM_SET_USER_MEMORY_REGION |
754 | 754 | ||
755 | Capability: KVM_CAP_USER_MEM | 755 | Capability: KVM_CAP_USER_MEM |
756 | Architectures: all | 756 | Architectures: all |
@@ -796,7 +796,7 @@ It is recommended to use this API instead of the KVM_SET_MEMORY_REGION ioctl. | |||
796 | The KVM_SET_MEMORY_REGION does not allow fine grained control over memory | 796 | The KVM_SET_MEMORY_REGION does not allow fine grained control over memory |
797 | allocation and is deprecated. | 797 | allocation and is deprecated. |
798 | 798 | ||
799 | 4.35 KVM_SET_TSS_ADDR | 799 | 4.36 KVM_SET_TSS_ADDR |
800 | 800 | ||
801 | Capability: KVM_CAP_SET_TSS_ADDR | 801 | Capability: KVM_CAP_SET_TSS_ADDR |
802 | Architectures: x86 | 802 | Architectures: x86 |
@@ -814,7 +814,7 @@ This ioctl is required on Intel-based hosts. This is needed on Intel hardware | |||
814 | because of a quirk in the virtualization implementation (see the internals | 814 | because of a quirk in the virtualization implementation (see the internals |
815 | documentation when it pops into existence). | 815 | documentation when it pops into existence). |
816 | 816 | ||
817 | 4.36 KVM_ENABLE_CAP | 817 | 4.37 KVM_ENABLE_CAP |
818 | 818 | ||
819 | Capability: KVM_CAP_ENABLE_CAP | 819 | Capability: KVM_CAP_ENABLE_CAP |
820 | Architectures: ppc | 820 | Architectures: ppc |
@@ -849,7 +849,7 @@ function properly, this is the place to put them. | |||
849 | __u8 pad[64]; | 849 | __u8 pad[64]; |
850 | }; | 850 | }; |
851 | 851 | ||
852 | 4.37 KVM_GET_MP_STATE | 852 | 4.38 KVM_GET_MP_STATE |
853 | 853 | ||
854 | Capability: KVM_CAP_MP_STATE | 854 | Capability: KVM_CAP_MP_STATE |
855 | Architectures: x86, ia64 | 855 | Architectures: x86, ia64 |
@@ -879,7 +879,7 @@ Possible values are: | |||
879 | This ioctl is only useful after KVM_CREATE_IRQCHIP. Without an in-kernel | 879 | This ioctl is only useful after KVM_CREATE_IRQCHIP. Without an in-kernel |
880 | irqchip, the multiprocessing state must be maintained by userspace. | 880 | irqchip, the multiprocessing state must be maintained by userspace. |
881 | 881 | ||
882 | 4.38 KVM_SET_MP_STATE | 882 | 4.39 KVM_SET_MP_STATE |
883 | 883 | ||
884 | Capability: KVM_CAP_MP_STATE | 884 | Capability: KVM_CAP_MP_STATE |
885 | Architectures: x86, ia64 | 885 | Architectures: x86, ia64 |
@@ -893,7 +893,7 @@ arguments. | |||
893 | This ioctl is only useful after KVM_CREATE_IRQCHIP. Without an in-kernel | 893 | This ioctl is only useful after KVM_CREATE_IRQCHIP. Without an in-kernel |
894 | irqchip, the multiprocessing state must be maintained by userspace. | 894 | irqchip, the multiprocessing state must be maintained by userspace. |
895 | 895 | ||
896 | 4.39 KVM_SET_IDENTITY_MAP_ADDR | 896 | 4.40 KVM_SET_IDENTITY_MAP_ADDR |
897 | 897 | ||
898 | Capability: KVM_CAP_SET_IDENTITY_MAP_ADDR | 898 | Capability: KVM_CAP_SET_IDENTITY_MAP_ADDR |
899 | Architectures: x86 | 899 | Architectures: x86 |
@@ -911,7 +911,7 @@ This ioctl is required on Intel-based hosts. This is needed on Intel hardware | |||
911 | because of a quirk in the virtualization implementation (see the internals | 911 | because of a quirk in the virtualization implementation (see the internals |
912 | documentation when it pops into existence). | 912 | documentation when it pops into existence). |
913 | 913 | ||
914 | 4.40 KVM_SET_BOOT_CPU_ID | 914 | 4.41 KVM_SET_BOOT_CPU_ID |
915 | 915 | ||
916 | Capability: KVM_CAP_SET_BOOT_CPU_ID | 916 | Capability: KVM_CAP_SET_BOOT_CPU_ID |
917 | Architectures: x86, ia64 | 917 | Architectures: x86, ia64 |
@@ -923,7 +923,7 @@ Define which vcpu is the Bootstrap Processor (BSP). Values are the same | |||
923 | as the vcpu id in KVM_CREATE_VCPU. If this ioctl is not called, the default | 923 | as the vcpu id in KVM_CREATE_VCPU. If this ioctl is not called, the default |
924 | is vcpu 0. | 924 | is vcpu 0. |
925 | 925 | ||
926 | 4.41 KVM_GET_XSAVE | 926 | 4.42 KVM_GET_XSAVE |
927 | 927 | ||
928 | Capability: KVM_CAP_XSAVE | 928 | Capability: KVM_CAP_XSAVE |
929 | Architectures: x86 | 929 | Architectures: x86 |
@@ -937,7 +937,7 @@ struct kvm_xsave { | |||
937 | 937 | ||
938 | This ioctl would copy current vcpu's xsave struct to the userspace. | 938 | This ioctl would copy current vcpu's xsave struct to the userspace. |
939 | 939 | ||
940 | 4.42 KVM_SET_XSAVE | 940 | 4.43 KVM_SET_XSAVE |
941 | 941 | ||
942 | Capability: KVM_CAP_XSAVE | 942 | Capability: KVM_CAP_XSAVE |
943 | Architectures: x86 | 943 | Architectures: x86 |
@@ -951,7 +951,7 @@ struct kvm_xsave { | |||
951 | 951 | ||
952 | This ioctl would copy userspace's xsave struct to the kernel. | 952 | This ioctl would copy userspace's xsave struct to the kernel. |
953 | 953 | ||
954 | 4.43 KVM_GET_XCRS | 954 | 4.44 KVM_GET_XCRS |
955 | 955 | ||
956 | Capability: KVM_CAP_XCRS | 956 | Capability: KVM_CAP_XCRS |
957 | Architectures: x86 | 957 | Architectures: x86 |
@@ -974,7 +974,7 @@ struct kvm_xcrs { | |||
974 | 974 | ||
975 | This ioctl would copy current vcpu's xcrs to the userspace. | 975 | This ioctl would copy current vcpu's xcrs to the userspace. |
976 | 976 | ||
977 | 4.44 KVM_SET_XCRS | 977 | 4.45 KVM_SET_XCRS |
978 | 978 | ||
979 | Capability: KVM_CAP_XCRS | 979 | Capability: KVM_CAP_XCRS |
980 | Architectures: x86 | 980 | Architectures: x86 |
@@ -997,7 +997,7 @@ struct kvm_xcrs { | |||
997 | 997 | ||
998 | This ioctl would set vcpu's xcr to the value userspace specified. | 998 | This ioctl would set vcpu's xcr to the value userspace specified. |
999 | 999 | ||
1000 | 4.45 KVM_GET_SUPPORTED_CPUID | 1000 | 4.46 KVM_GET_SUPPORTED_CPUID |
1001 | 1001 | ||
1002 | Capability: KVM_CAP_EXT_CPUID | 1002 | Capability: KVM_CAP_EXT_CPUID |
1003 | Architectures: x86 | 1003 | Architectures: x86 |
@@ -1062,7 +1062,7 @@ emulate them efficiently. The fields in each entry are defined as follows: | |||
1062 | eax, ebx, ecx, edx: the values returned by the cpuid instruction for | 1062 | eax, ebx, ecx, edx: the values returned by the cpuid instruction for |
1063 | this function/index combination | 1063 | this function/index combination |
1064 | 1064 | ||
1065 | 4.46 KVM_PPC_GET_PVINFO | 1065 | 4.47 KVM_PPC_GET_PVINFO |
1066 | 1066 | ||
1067 | Capability: KVM_CAP_PPC_GET_PVINFO | 1067 | Capability: KVM_CAP_PPC_GET_PVINFO |
1068 | Architectures: ppc | 1068 | Architectures: ppc |
@@ -1085,7 +1085,7 @@ of 4 instructions that make up a hypercall. | |||
1085 | If any additional field gets added to this structure later on, a bit for that | 1085 | If any additional field gets added to this structure later on, a bit for that |
1086 | additional piece of information will be set in the flags bitmap. | 1086 | additional piece of information will be set in the flags bitmap. |
1087 | 1087 | ||
1088 | 4.47 KVM_ASSIGN_PCI_DEVICE | 1088 | 4.48 KVM_ASSIGN_PCI_DEVICE |
1089 | 1089 | ||
1090 | Capability: KVM_CAP_DEVICE_ASSIGNMENT | 1090 | Capability: KVM_CAP_DEVICE_ASSIGNMENT |
1091 | Architectures: x86 ia64 | 1091 | Architectures: x86 ia64 |
@@ -1113,7 +1113,7 @@ following flags are specified: | |||
1113 | /* Depends on KVM_CAP_IOMMU */ | 1113 | /* Depends on KVM_CAP_IOMMU */ |
1114 | #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) | 1114 | #define KVM_DEV_ASSIGN_ENABLE_IOMMU (1 << 0) |
1115 | 1115 | ||
1116 | 4.48 KVM_DEASSIGN_PCI_DEVICE | 1116 | 4.49 KVM_DEASSIGN_PCI_DEVICE |
1117 | 1117 | ||
1118 | Capability: KVM_CAP_DEVICE_DEASSIGNMENT | 1118 | Capability: KVM_CAP_DEVICE_DEASSIGNMENT |
1119 | Architectures: x86 ia64 | 1119 | Architectures: x86 ia64 |
@@ -1126,7 +1126,7 @@ Ends PCI device assignment, releasing all associated resources. | |||
1126 | See KVM_CAP_DEVICE_ASSIGNMENT for the data structure. Only assigned_dev_id is | 1126 | See KVM_CAP_DEVICE_ASSIGNMENT for the data structure. Only assigned_dev_id is |
1127 | used in kvm_assigned_pci_dev to identify the device. | 1127 | used in kvm_assigned_pci_dev to identify the device. |
1128 | 1128 | ||
1129 | 4.49 KVM_ASSIGN_DEV_IRQ | 1129 | 4.50 KVM_ASSIGN_DEV_IRQ |
1130 | 1130 | ||
1131 | Capability: KVM_CAP_ASSIGN_DEV_IRQ | 1131 | Capability: KVM_CAP_ASSIGN_DEV_IRQ |
1132 | Architectures: x86 ia64 | 1132 | Architectures: x86 ia64 |
@@ -1164,7 +1164,7 @@ The following flags are defined: | |||
1164 | It is not valid to specify multiple types per host or guest IRQ. However, the | 1164 | It is not valid to specify multiple types per host or guest IRQ. However, the |
1165 | IRQ type of host and guest can differ or can even be null. | 1165 | IRQ type of host and guest can differ or can even be null. |
1166 | 1166 | ||
1167 | 4.50 KVM_DEASSIGN_DEV_IRQ | 1167 | 4.51 KVM_DEASSIGN_DEV_IRQ |
1168 | 1168 | ||
1169 | Capability: KVM_CAP_ASSIGN_DEV_IRQ | 1169 | Capability: KVM_CAP_ASSIGN_DEV_IRQ |
1170 | Architectures: x86 ia64 | 1170 | Architectures: x86 ia64 |
@@ -1178,7 +1178,7 @@ See KVM_ASSIGN_DEV_IRQ for the data structure. The target device is specified | |||
1178 | by assigned_dev_id, flags must correspond to the IRQ type specified on | 1178 | by assigned_dev_id, flags must correspond to the IRQ type specified on |
1179 | KVM_ASSIGN_DEV_IRQ. Partial deassignment of host or guest IRQ is allowed. | 1179 | KVM_ASSIGN_DEV_IRQ. Partial deassignment of host or guest IRQ is allowed. |
1180 | 1180 | ||
1181 | 4.51 KVM_SET_GSI_ROUTING | 1181 | 4.52 KVM_SET_GSI_ROUTING |
1182 | 1182 | ||
1183 | Capability: KVM_CAP_IRQ_ROUTING | 1183 | Capability: KVM_CAP_IRQ_ROUTING |
1184 | Architectures: x86 ia64 | 1184 | Architectures: x86 ia64 |
@@ -1226,7 +1226,7 @@ struct kvm_irq_routing_msi { | |||
1226 | __u32 pad; | 1226 | __u32 pad; |
1227 | }; | 1227 | }; |
1228 | 1228 | ||
1229 | 4.52 KVM_ASSIGN_SET_MSIX_NR | 1229 | 4.53 KVM_ASSIGN_SET_MSIX_NR |
1230 | 1230 | ||
1231 | Capability: KVM_CAP_DEVICE_MSIX | 1231 | Capability: KVM_CAP_DEVICE_MSIX |
1232 | Architectures: x86 ia64 | 1232 | Architectures: x86 ia64 |
@@ -1245,7 +1245,7 @@ struct kvm_assigned_msix_nr { | |||
1245 | 1245 | ||
1246 | #define KVM_MAX_MSIX_PER_DEV 256 | 1246 | #define KVM_MAX_MSIX_PER_DEV 256 |
1247 | 1247 | ||
1248 | 4.53 KVM_ASSIGN_SET_MSIX_ENTRY | 1248 | 4.54 KVM_ASSIGN_SET_MSIX_ENTRY |
1249 | 1249 | ||
1250 | Capability: KVM_CAP_DEVICE_MSIX | 1250 | Capability: KVM_CAP_DEVICE_MSIX |
1251 | Architectures: x86 ia64 | 1251 | Architectures: x86 ia64 |
diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt index 11d5ceda5bb0..36f007514db3 100644 --- a/Documentation/sysctl/kernel.txt +++ b/Documentation/sysctl/kernel.txt | |||
@@ -367,7 +367,7 @@ the different loglevels. | |||
367 | 367 | ||
368 | - console_loglevel: messages with a higher priority than | 368 | - console_loglevel: messages with a higher priority than |
369 | this will be printed to the console | 369 | this will be printed to the console |
370 | - default_message_level: messages without an explicit priority | 370 | - default_message_loglevel: messages without an explicit priority |
371 | will be printed with this priority | 371 | will be printed with this priority |
372 | - minimum_console_loglevel: minimum (highest) value to which | 372 | - minimum_console_loglevel: minimum (highest) value to which |
373 | console_loglevel can be set | 373 | console_loglevel can be set |
diff --git a/Documentation/vm/unevictable-lru.txt b/Documentation/vm/unevictable-lru.txt index 2d70d0d95108..97bae3c576c2 100644 --- a/Documentation/vm/unevictable-lru.txt +++ b/Documentation/vm/unevictable-lru.txt | |||
@@ -84,8 +84,7 @@ indicate that the page is being managed on the unevictable list. | |||
84 | 84 | ||
85 | The PG_unevictable flag is analogous to, and mutually exclusive with, the | 85 | The PG_unevictable flag is analogous to, and mutually exclusive with, the |
86 | PG_active flag in that it indicates on which LRU list a page resides when | 86 | PG_active flag in that it indicates on which LRU list a page resides when |
87 | PG_lru is set. The unevictable list is compile-time configurable based on the | 87 | PG_lru is set. |
88 | UNEVICTABLE_LRU Kconfig option. | ||
89 | 88 | ||
90 | The Unevictable LRU infrastructure maintains unevictable pages on an additional | 89 | The Unevictable LRU infrastructure maintains unevictable pages on an additional |
91 | LRU list for a few reasons: | 90 | LRU list for a few reasons: |