diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-07-09 08:39:51 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-07-09 08:39:51 -0400 |
| commit | 04bea4b9a4e410a540843933243be26de1592135 (patch) | |
| tree | 8731f2550254fa7e5be8eff9233a6d0a69edb44b /Documentation | |
| parent | e198cf1ad2f9ccedd005789a740d0eb5b3942447 (diff) | |
| parent | 8097be3bc58315b14498000585299e3c06fb13ce (diff) | |
Merge tag 'v3.12.24' into v3.12-rt
This is the 3.12.24 stable release
Conflicts:
include/linux/irqdesc.h
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 3 | ||||
| -rw-r--r-- | Documentation/vm/hwpoison.txt | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 4f7c57cb6022..789b8941a0c6 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -343,6 +343,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. no: ACPI OperationRegions are not marked as reserved, no further checks are performed. + acpi_no_memhotplug [ACPI] Disable memory hotplug. Useful for kdump + kernels. + add_efi_memmap [EFI; X86] Include EFI memory map in kernel's map of available physical RAM. diff --git a/Documentation/vm/hwpoison.txt b/Documentation/vm/hwpoison.txt index 550068466605..6ae89a9edf2a 100644 --- a/Documentation/vm/hwpoison.txt +++ b/Documentation/vm/hwpoison.txt @@ -84,6 +84,11 @@ PR_MCE_KILL PR_MCE_KILL_EARLY: Early kill PR_MCE_KILL_LATE: Late kill PR_MCE_KILL_DEFAULT: Use system global default + Note that if you want to have a dedicated thread which handles + the SIGBUS(BUS_MCEERR_AO) on behalf of the process, you should + call prctl(PR_MCE_KILL_EARLY) on the designated thread. Otherwise, + the SIGBUS is sent to the main thread. + PR_MCE_KILL_GET return current mode |