diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-14 13:35:50 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-14 13:35:50 -0500 |
| commit | 1603130236c55ddabc3854d4ba62d544debcf1f5 (patch) | |
| tree | 02b1cffad943cb69c2b79118b0ab9a758b9e0f1a /os | |
| parent | f207e69d62bc04c7f254347b03e6d8fa8b569d66 (diff) | |
| parent | f7dd0c72b8f861f4d5443a43d1013e3fe3db43ca (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
Xext/xace.c
Xext/xace.h
Diffstat (limited to 'os')
| -rw-r--r-- | os/utils.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/os/utils.c b/os/utils.c index d69936df7..769fd4fdf 100644 --- a/os/utils.c +++ b/os/utils.c @@ -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; |