diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-04 12:12:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-03-04 12:12:48 -0800 |
| commit | e64b9562ba281dc1dc613408707375cb9c5660e5 (patch) | |
| tree | 46caa9c76d12573273a43df525e81e12845bceef /Documentation | |
| parent | 7225a442788e20ee108ef2cb97d511375e20acf9 (diff) | |
| parent | 30009746168da0f1f648881f77083c40e226a8a0 (diff) | |
Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Thomas Gleixner:
"A small set of fixes for x86:
- Add missing instruction suffixes to assembly code so it can be
compiled by newer GAS versions without warnings.
- Switch refcount WARN exceptions to UD2 as we did in general
- Make the reboot on Intel Edison platforms work
- A small documentation update so text and sample command match"
* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
Documentation, x86, resctrl: Make text and sample command match
x86/platform/intel-mid: Handle Intel Edison reboot correctly
x86/asm: Add instruction suffixes to bitops
x86/entry/64: Add instruction suffix
x86/refcounts: Switch to UD2 for exceptions
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/x86/intel_rdt_ui.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/x86/intel_rdt_ui.txt b/Documentation/x86/intel_rdt_ui.txt index 756fd76b78a6..71c30984e94d 100644 --- a/Documentation/x86/intel_rdt_ui.txt +++ b/Documentation/x86/intel_rdt_ui.txt @@ -671,7 +671,7 @@ occupancy of the real time threads on these cores. # mkdir p1 Move the cpus 4-7 over to p1 -# echo f0 > p0/cpus +# echo f0 > p1/cpus View the llc occupancy snapshot |