aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Cerqueira <felipec@mpi-sws.org>2013-05-01 13:19:58 -0400
committerBjoern Brandenburg <bbb@mpi-sws.org>2013-05-03 04:52:36 -0400
commitd23bba2c2fb91821edc8be5a343f434bc7d35efb (patch)
tree70f1a111d93b5504c07c00b70acf427117a4c557
parent4ffefb822b9d65d4efbedb60e3c9a0e76895cc5b (diff)
Fix enum name conflict
EARLY in release_policy_t was conflicting with other kernel constants.
-rw-r--r--include/litmus/litmus.h6
-rw-r--r--include/litmus/rt_param.h6
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);
65#define get_lateness(t) (tsk_rt(t)->job_params.lateness) 65#define get_lateness(t) (tsk_rt(t)->job_params.lateness)
66 66
67/* release policy macros */ 67/* release policy macros */
68#define is_periodic(t) (get_release_policy(t) == PERIODIC) 68#define is_periodic(t) (get_release_policy(t) == TASK_PERIODIC)
69#define is_sporadic(t) (get_release_policy(t) == SPORADIC) 69#define is_sporadic(t) (get_release_policy(t) == TASK_SPORADIC)
70#ifdef CONFIG_ALLOW_EARLY_RELEASE 70#ifdef CONFIG_ALLOW_EARLY_RELEASE
71#define is_early_releasing(t) (get_release_policy(t) == EARLY) 71#define is_early_releasing(t) (get_release_policy(t) == TASK_EARLY)
72#else 72#else
73#define is_early_releasing(t) (0) 73#define is_early_releasing(t) (0)
74#endif 74#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 {
39typedef enum { 39typedef enum {
40 /* Jobs are released sporadically (provided job precedence 40 /* Jobs are released sporadically (provided job precedence
41 constraints are met). */ 41 constraints are met). */
42 SPORADIC, 42 TASK_SPORADIC,
43 43
44 /* Jobs are released periodically (provided job precedence 44 /* Jobs are released periodically (provided job precedence
45 constraints are met). */ 45 constraints are met). */
46 PERIODIC, 46 TASK_PERIODIC,
47 47
48 /* Jobs are released immediately after meeting precedence 48 /* Jobs are released immediately after meeting precedence
49 constraints. Beware this can peg your CPUs if used in 49 constraints. Beware this can peg your CPUs if used in
50 the wrong applications. Only supported by EDF schedulers. */ 50 the wrong applications. Only supported by EDF schedulers. */
51 EARLY 51 TASK_EARLY
52} release_policy_t; 52} release_policy_t;
53 53
54/* We use the common priority interpretation "lower index == higher priority", 54/* We use the common priority interpretation "lower index == higher priority",