Messages in this thread Patch in this message | | | Date | Mon, 13 Feb 2006 02:11:43 +0100 (CET) | From | Roman Zippel <> | Subject | [PATCH 11/13] hrtimer: fix multiple macro argument expansion |
| |
For two macros the arguments were expanded twice, change them to inline functions to avoid it.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
---
include/linux/ktime.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
Index: linux-2.6-git/include/linux/ktime.h =================================================================== --- linux-2.6-git.orig/include/linux/ktime.h 2006-02-12 18:33:42.000000000 +0100 +++ linux-2.6-git/include/linux/ktime.h 2006-02-12 18:33:45.000000000 +0100 @@ -93,10 +93,16 @@ static inline ktime_t ktime_set(long sec ({ (ktime_t){ .tv64 = (kt).tv64 + (nsval) }; }) /* convert a timespec to ktime_t format: */ -#define timespec_to_ktime(ts) ktime_set((ts).tv_sec, (ts).tv_nsec) +static inline ktime_t timespec_to_ktime(struct timespec ts) +{ + return ktime_set(ts.tv_sec, ts.tv_nsec); +} /* convert a timeval to ktime_t format: */ -#define timeval_to_ktime(tv) ktime_set((tv).tv_sec, (tv).tv_usec * 1000) +static inline ktime_t timeval_to_ktime(struct timeval tv) +{ + return ktime_set(tv.tv_sec, tv.tv_usec * NSEC_PER_USEC); +} /* Map the ktime_t to timespec conversion to nsec_to_timespec function */ #define ktime_to_timespec(kt) nsec_to_timespec((kt).tv64) - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |