xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'core/percpu' into x86/core

Browse Source 
Conflicts:
	kernel/irq/handle.c
This commit is contained in:
Ingo Molnar
2009-01-28 23:12:55 +01:00
parent 18e352e4a7 4369f1fb7c
commit 6a385db5ce
168 changed files with 2315 additions and 2348 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/firmware/dcdbas.c
View File

@@ -244,7 +244,7 @@ static ssize_t host_control_on_shutdown_store(struct device *dev,
*/
int dcdbas_smi_request(struct smi_cmd *smi_cmd)
{
cpumask_t old_mask;
cpumask_var_t old_mask;
int ret = 0;
if (smi_cmd->magic != SMI_CMD_MAGIC) {
@@ -254,8 +254,11 @@ int dcdbas_smi_request(struct smi_cmd *smi_cmd)
}
/* SMI requires CPU 0 */
old_mask = current->cpus_allowed;
set_cpus_allowed_ptr(current, &cpumask_of_cpu(0));
if (!alloc_cpumask_var(&old_mask, GFP_KERNEL))
return -ENOMEM;
cpumask_copy(old_mask, &current->cpus_allowed);
set_cpus_allowed_ptr(current, cpumask_of(0));
if (smp_processor_id() != 0) {
dev_dbg(&dcdbas_pdev->dev, "%s: failed to get CPU 0\n",
__func__);
@@ -275,7 +278,8 @@ int dcdbas_smi_request(struct smi_cmd *smi_cmd)
);
out:
set_cpus_allowed_ptr(current, &old_mask);
set_cpus_allowed_ptr(current, old_mask);
free_cpumask_var(old_mask);
return ret;
}