diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-13 14:41:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-08-13 14:41:53 -0700 |
| commit | 7796916146b8c34cbbef66470ab8b5b28cf47e83 (patch) | |
| tree | 2280695ae6461ea0cc00b8ba5ec357ffe2e2ee8a /Documentation | |
| parent | 36f49ca8ca6d786936f48b874d30fded5b2b7bd9 (diff) | |
| parent | 301d328a6f8b53bb86c5ecf72db7bc178bcf1999 (diff) | |
| download | linux-7796916146b8c34cbbef66470ab8b5b28cf47e83.tar.bz2 | |
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cpu updates from Thomas Gleixner:
"Two small updates for the CPU code:
- Improve NUMA emulation
- Add the EPT_AD CPU feature bit"
* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/cpufeatures: Add EPT_AD feature bit
x86/numa_emulation: Introduce uniform split capability
x86/numa_emulation: Fix emulated-to-physical node mapping
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/x86/x86_64/boot-options.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index 8d109ef67ab6..3a2ba436721a 100644 --- a/Documentation/x86/x86_64/boot-options.txt +++ b/Documentation/x86/x86_64/boot-options.txt @@ -156,6 +156,10 @@ NUMA If given as an integer, fills all system RAM with N fake nodes interleaved over physical nodes. + numa=fake=<N>U + If given as an integer followed by 'U', it will divide each + physical node into N emulated nodes. + ACPI acpi=off Don't enable ACPI |