From c5af1efe65f6ef7af783c408a4cc964c2c8bf405 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 16 Feb 2007 01:27:29 -0800 Subject: [PATCH] --- yaml --- r: 48562 b: refs/heads/master c: 9f907c0144496e464bd5ed5a99a51227d63a9c0b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/jiffies.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ea6407653020..44a6935efb3b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41cf54455da5e5dc847a9733d49ca23b5e7dd59e +refs/heads/master: 9f907c0144496e464bd5ed5a99a51227d63a9c0b diff --git a/trunk/include/linux/jiffies.h b/trunk/include/linux/jiffies.h index 9243cefa4512..c080f61fb024 100644 --- a/trunk/include/linux/jiffies.h +++ b/trunk/include/linux/jiffies.h @@ -142,13 +142,13 @@ static inline u64 get_jiffies_64(void) * * And some not so obvious. * - * Note that we don't want to return MAX_LONG, because + * Note that we don't want to return LONG_MAX, because * for various timeout reasons we often end up having * to wait "jiffies+1" in order to guarantee that we wait * at _least_ "jiffies" - so "jiffies+1" had better still * be positive. */ -#define MAX_JIFFY_OFFSET ((~0UL >> 1)-1) +#define MAX_JIFFY_OFFSET ((LONG_MAX >> 1)-1) /* * We want to do realistic conversions of time so we need to use the same