diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-03-17 09:44:57 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-03-17 09:44:57 +0100 |
commit | 00f526850151e91fdad0896a1436341687ad2582 (patch) | |
tree | 67c28260020440ade83d6f4aa003ae4f0c683e67 /arch/x86/kernel/fpu | |
parent | x86/mm, x86/mce: Fix return type/value for memcpy_mcsafe() (diff) | |
parent | arch/x86/irq: Purge useless handler declarations from hw_irq.h (diff) | |
download | linux-00f526850151e91fdad0896a1436341687ad2582.tar.xz linux-00f526850151e91fdad0896a1436341687ad2582.zip |
Merge branch 'x86/cleanups' into x86/urgent
Pull in some merge window leftovers.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/fpu')
-rw-r--r-- | arch/x86/kernel/fpu/regset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/fpu/regset.c b/arch/x86/kernel/fpu/regset.c index 0bc3490420c5..8bd1c003942a 100644 --- a/arch/x86/kernel/fpu/regset.c +++ b/arch/x86/kernel/fpu/regset.c @@ -8,7 +8,7 @@ /* * The xstateregs_active() routine is the same as the regset_fpregs_active() routine, * as the "regset->n" for the xstate regset will be updated based on the feature - * capabilites supported by the xsave. + * capabilities supported by the xsave. */ int regset_fpregs_active(struct task_struct *target, const struct user_regset *regset) { |