From 2af90a581d20c983446d354051f0f098a5d4eacb Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 9 Oct 2002 16:29:01 +0000
Subject: [PATCH] replaced max() macro with conditional expression

---
 linux-core/drm_os_linux.h | 2 +-
 linux/drm_os_linux.h      | 2 +-
 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;				\