summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2002-10-09 16:29:01 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2002-10-09 16:29:01 +0000
commit2af90a581d20c983446d354051f0f098a5d4eacb (patch)
tree04459ecb5b95f7aa40f4bb9c30bb598c1bddbfcd
parentaa1ca406d637a1eabbff272c0508bed5eb1147a1 (diff)
replaced max() macro with conditional expression
-rw-r--r--linux-core/drm_os_linux.h2
-rw-r--r--linux/drm_os_linux.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/linux-core/drm_os_linux.h b/linux-core/drm_os_linux.h
index cf003137..e9b24356 100644
--- a/linux-core/drm_os_linux.h
+++ b/linux-core/drm_os_linux.h
@@ -74,7 +74,7 @@ do { \
ret = -EBUSY; \
break; \
} \
- schedule_timeout(max(HZ/100,1)); \
+ schedule_timeout((HZ/100 > 1) ? HZ/100 : 1); \
if (signal_pending(current)) { \
ret = -EINTR; \
break; \
diff --git a/linux/drm_os_linux.h b/linux/drm_os_linux.h
index cf003137..e9b24356 100644
--- a/linux/drm_os_linux.h
+++ b/linux/drm_os_linux.h
@@ -74,7 +74,7 @@ do { \
ret = -EBUSY; \
break; \
} \
- schedule_timeout(max(HZ/100,1)); \
+ schedule_timeout((HZ/100 > 1) ? HZ/100 : 1); \
if (signal_pending(current)) { \
ret = -EINTR; \
break; \