diff options
author | Christopher Kenna <cjk@cs.unc.edu> | 2012-12-03 14:34:03 -0500 |
---|---|---|
committer | Christopher Kenna <cjk@cs.unc.edu> | 2012-12-03 14:47:03 -0500 |
commit | b79beb1d09d98d8f8606e9bba40880d32f744265 (patch) | |
tree | d1735f8bcd3590f4246ad17c1038f5cbea4c62a2 /include/litmus | |
parent | 1281cd8055be5dd42778d0294cfccfcb477650ff (diff) |
Update memory protection flags. Comment-out some debug messages.
Diffstat (limited to 'include/litmus')
-rw-r--r-- | include/litmus/color.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/litmus/color.h b/include/litmus/color.h index 2f7e19cd4602..a018ce428461 100644 --- a/include/litmus/color.h +++ b/include/litmus/color.h | |||
@@ -86,8 +86,8 @@ int color_reclaim_pages_handler(struct ctl_table *, int, void __user *, | |||
86 | int color_sched_in_task(struct task_struct*); | 86 | int color_sched_in_task(struct task_struct*); |
87 | int color_sched_out_task(struct task_struct*); | 87 | int color_sched_out_task(struct task_struct*); |
88 | 88 | ||
89 | #ifdef CONFIG_LOCKDEP | ||
90 | #define LITMUS_LOCKDEP_NAME_MAX_LEN 50 | 89 | #define LITMUS_LOCKDEP_NAME_MAX_LEN 50 |
90 | #ifdef CONFIG_LOCKDEP | ||
91 | #define LOCKDEP_DYNAMIC_ALLOC(lock, key, name_buf, fmt, args...) \ | 91 | #define LOCKDEP_DYNAMIC_ALLOC(lock, key, name_buf, fmt, args...) \ |
92 | do { \ | 92 | do { \ |
93 | snprintf(name_buf, LITMUS_LOCKDEP_NAME_MAX_LEN, \ | 93 | snprintf(name_buf, LITMUS_LOCKDEP_NAME_MAX_LEN, \ |
@@ -95,7 +95,6 @@ int color_sched_out_task(struct task_struct*); | |||
95 | lockdep_set_class_and_name(lock, key, name_buf); \ | 95 | lockdep_set_class_and_name(lock, key, name_buf); \ |
96 | } while (0) | 96 | } while (0) |
97 | #else | 97 | #else |
98 | #define LITMUS_LOCKDEP_NAME_MAX_LEN 0 | ||
99 | #define LOCKDEP_DYNAMIC_ALLOC(lock, key, name_buf, fmt, args) \ | 98 | #define LOCKDEP_DYNAMIC_ALLOC(lock, key, name_buf, fmt, args) \ |
100 | do { (void)(key); } while (0) | 99 | do { (void)(key); } while (0) |
101 | #endif | 100 | #endif |