← Back to branch summary

~ubuntu-branches/ubuntu/vivid/thermald/vivid

« back to all changes in this revision

Viewing changes to src/thd_zone_cpu.cpp

  • Committer: Package Import Robot
  • Author(s): Colin King
  • Date: 2014-09-15 09:27:00 UTC
  • Revision ID: package-import@ubuntu.com-20140915092700-7ckbpjj2boya27il
Tags: 1.3-5
http://bugs.debian.org/761290
Fix RT Linux lockup with x86 package temp driver (Closes: #761290)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/thd_zone_cpu.cpp
229
229
        if (init() != THD_SUCCESS)
230
230
                return THD_ERROR;
231
231
 
232
 
        sensor = thd_engine->search_sensor("pkg-temp-0");
233
 
        if (sensor) {
234
 
                bind_sensor(sensor);
235
 
                async_sensor = true;
 
232
        if (!thd_engine->rt_kernel_status()) {
 
233
                sensor = thd_engine->search_sensor("pkg-temp-0");
 
234
                if (sensor) {
 
235
                        bind_sensor(sensor);
 
236
                        async_sensor = true;
 
237
                }
236
238
        }
237
239
 
238
 
        sensor = thd_engine->search_sensor("x86_pkg_temp");
239
 
        if (sensor) {
240
 
                bind_sensor(sensor);
241
 
                async_sensor = true;
 
240
        if (!thd_engine->rt_kernel_status()) {
 
241
                sensor = thd_engine->search_sensor("x86_pkg_temp");
 
242
                if (sensor) {
 
243
                        bind_sensor(sensor);
 
244
                        async_sensor = true;
 
245
                }
242
246
        }
243
247
 
244
248
        sensor = thd_engine->search_sensor("soc_dts0");