diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-20 11:59:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-20 12:01:01 +0200 |
| commit | 6f56a8d024757e2f3bda8bf3bdf6aa1a21e6810b (patch) | |
| tree | 923d044c9cb5e3e89fdf02af35acc050e4f39195 /Documentation | |
| parent | 5856afed0c8c419286d9f0c8e57e83e2875eec4b (diff) | |
| parent | e88221c50cadade0eb4f7f149f4967d760212695 (diff) | |
| download | op-kernel-dev-6f56a8d024757e2f3bda8bf3bdf6aa1a21e6810b.zip op-kernel-dev-6f56a8d024757e2f3bda8bf3bdf6aa1a21e6810b.tar.gz | |
Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict
Conflicts:
arch/x86/kernel/i387.c
This commit is conflicting:
e88221c50cad ("x86/fpu: Disable XSAVES* support for now")
These functions changed a lot, move the quirk to arch/x86/kernel/fpu/init.c's
fpu__init_system_xstate_size_legacy().
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ABI/testing/sysfs-devices-system-cpu | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu index 99983e6..da95513 100644 --- a/Documentation/ABI/testing/sysfs-devices-system-cpu +++ b/Documentation/ABI/testing/sysfs-devices-system-cpu @@ -162,7 +162,7 @@ Description: Discover CPUs in the same CPU frequency coordination domain What: /sys/devices/system/cpu/cpu*/cache/index3/cache_disable_{0,1} Date: August 2008 KernelVersion: 2.6.27 -Contact: discuss@x86-64.org +Contact: Linux kernel mailing list <linux-kernel@vger.kernel.org> Description: Disable L3 cache indices These files exist in every CPU's cache/index3 directory. Each |
