From a6ce170764b0ec75d3ddbca20823b2a951a225d2 Mon Sep 17 00:00:00 2001 From: Wenji Huang Date: Mon, 17 Nov 2008 00:06:59 -0500 Subject: Fix the conflicted for_each_cpu macro with 2.6.28. --- runtime/runtime.h | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'runtime/runtime.h') diff --git a/runtime/runtime.h b/runtime/runtime.h index cd3d0b11..7507e594 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h @@ -39,8 +39,14 @@ #define STP_OLD_TRANSPORT #endif -#ifndef for_each_cpu -#define for_each_cpu(cpu) for_each_cpu_mask((cpu), cpu_possible_map) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) +#ifndef stp_for_each_cpu +#define stp_for_each_cpu(cpu) for_each_cpu((cpu), cpu_possible_map) +#endif +#else +#ifndef stp_for_each_cpu +#define stp_for_each_cpu(cpu) for_each_cpu_mask((cpu), cpu_possible_map) +#endif #endif static void _stp_dbug (const char *func, int line, const char *fmt, ...); -- cgit