Merge "msm: thermal: Update scm calls in KTM with non-atomic calls"

This commit is contained in:
Linux Build Service Account 2015-05-01 20:27:56 -07:00 committed by Gerrit - the friendly Code Review server
commit 6754c37cc7
1 changed files with 4 additions and 3 deletions

View File

@ -2410,12 +2410,13 @@ static void msm_thermal_bite(int zone_id, long temp)
tsens_id, temp);
}
if (!is_scm_armv8()) {
scm_call_atomic1(SCM_SVC_BOOT, THERM_SECURE_BITE_CMD, 0);
scm_call(SCM_SVC_BOOT, THERM_SECURE_BITE_CMD,
NULL, 0, NULL, 0);
} else {
desc.args[0] = 0;
desc.arginfo = SCM_ARGS(1);
scm_call2_atomic(SCM_SIP_FNID(SCM_SVC_BOOT,
THERM_SECURE_BITE_CMD), &desc);
scm_call2(SCM_SIP_FNID(SCM_SVC_BOOT,
THERM_SECURE_BITE_CMD), &desc);
}
}