Commit 6d827fbc authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman

i8k: Fix non-SMP operation

Commit f36fdb9f (i8k: Force SMM to run on CPU 0) adds support
for multi-core CPUs to the driver. Unfortunately, that causes it
to fail loading if compiled without SMP support, at least on
32 bit kernels. Kernel log shows "i8k: unable to get SMM Dell
signature", and function i8k_smm is found to return -EINVAL.

Testing revealed that the culprit is the missing return value check
of set_cpus_allowed_ptr.

Fixes: f36fdb9f (i8k: Force SMM to run on CPU 0)
Reported-by: default avatarJim Bos <jim876@xs4all.nl>
Tested-by: default avatarJim Bos <jim876@xs4all.nl>
Cc: stable@vger.kernel.org # 3.14+
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Cc: Andreas Mohr <andi@lisas.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9bd2d0df
...@@ -138,7 +138,9 @@ static int i8k_smm(struct smm_regs *regs) ...@@ -138,7 +138,9 @@ static int i8k_smm(struct smm_regs *regs)
if (!alloc_cpumask_var(&old_mask, GFP_KERNEL)) if (!alloc_cpumask_var(&old_mask, GFP_KERNEL))
return -ENOMEM; return -ENOMEM;
cpumask_copy(old_mask, &current->cpus_allowed); cpumask_copy(old_mask, &current->cpus_allowed);
set_cpus_allowed_ptr(current, cpumask_of(0)); rc = set_cpus_allowed_ptr(current, cpumask_of(0));
if (rc)
goto out;
if (smp_processor_id() != 0) { if (smp_processor_id() != 0) {
rc = -EBUSY; rc = -EBUSY;
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment