From d23bba2c2fb91821edc8be5a343f434bc7d35efb Mon Sep 17 00:00:00 2001 From: Felipe Cerqueira Date: Wed, 1 May 2013 19:19:58 +0200 Subject: Fix enum name conflict EARLY in release_policy_t was conflicting with other kernel constants. --- include/litmus/litmus.h | 6 +++--- include/litmus/rt_param.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h index c9206adb3493..613264655d97 100644 --- a/include/litmus/litmus.h +++ b/include/litmus/litmus.h @@ -65,10 +65,10 @@ void litmus_exit_task(struct task_struct *tsk); #define get_lateness(t) (tsk_rt(t)->job_params.lateness) /* release policy macros */ -#define is_periodic(t) (get_release_policy(t) == PERIODIC) -#define is_sporadic(t) (get_release_policy(t) == SPORADIC) +#define is_periodic(t) (get_release_policy(t) == TASK_PERIODIC) +#define is_sporadic(t) (get_release_policy(t) == TASK_SPORADIC) #ifdef CONFIG_ALLOW_EARLY_RELEASE -#define is_early_releasing(t) (get_release_policy(t) == EARLY) +#define is_early_releasing(t) (get_release_policy(t) == TASK_EARLY) #else #define is_early_releasing(t) (0) #endif diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h index a16ac84d8043..0b40b23a8589 100644 --- a/include/litmus/rt_param.h +++ b/include/litmus/rt_param.h @@ -39,16 +39,16 @@ typedef enum { typedef enum { /* Jobs are released sporadically (provided job precedence constraints are met). */ - SPORADIC, + TASK_SPORADIC, /* Jobs are released periodically (provided job precedence constraints are met). */ - PERIODIC, + TASK_PERIODIC, /* Jobs are released immediately after meeting precedence constraints. Beware this can peg your CPUs if used in the wrong applications. Only supported by EDF schedulers. */ - EARLY + TASK_EARLY } release_policy_t; /* We use the common priority interpretation "lower index == higher priority", -- cgit v1.2.2