mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-29 21:46:40 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: Xext/xace.c Xext/xace.h
This commit is contained in:
commit
1603130236
35 changed files with 673 additions and 635 deletions
|
|
@ -1508,6 +1508,8 @@ SmartScheduleStopTimer (void)
|
|||
#ifdef SMART_SCHEDULE_POSSIBLE
|
||||
struct itimerval timer;
|
||||
|
||||
if (SmartScheduleDisable)
|
||||
return;
|
||||
timer.it_interval.tv_sec = 0;
|
||||
timer.it_interval.tv_usec = 0;
|
||||
timer.it_value.tv_sec = 0;
|
||||
|
|
@ -1522,6 +1524,8 @@ SmartScheduleStartTimer (void)
|
|||
#ifdef SMART_SCHEDULE_POSSIBLE
|
||||
struct itimerval timer;
|
||||
|
||||
if (SmartScheduleDisable)
|
||||
return;
|
||||
timer.it_interval.tv_sec = 0;
|
||||
timer.it_interval.tv_usec = SmartScheduleInterval * 1000;
|
||||
timer.it_value.tv_sec = 0;
|
||||
|
|
|
|||
Loading…
Reference in a new issue