don't include NP-Flag syscalls if config option is not selected

2 files changed, 39 insertions, 7 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index ca9d3c8d88..8a4c44999f 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -86,13 +86,6 @@ void list_qsort(struct list_head* list, list_cmp_t less_than);
 #define RT_NON_PREEMPTIVE       0x4e50 /* =  P */
 #define RT_EXIT_NP_REQUESTED    0x5251 /* = RQ */
 
-/* returns 1 if task t has registered np flag and set it to RT_NON_PREEMPTIVE
- */
-int is_np(struct task_struct *t);
-
-/* request that the task should call sys_exit_np()
- */
-void request_exit_np(struct task_struct *t);
 
 /* kill naughty tasks
  */
@@ -183,4 +176,26 @@ void srp_ceiling_block(void);
 
 #define heap2task(hn) ((struct task_struct*) hn->value)
 
+
+#ifdef CONFIG_NP_SECTION
+/* returns 1 if task t has registered np flag and set it to RT_NON_PREEMPTIVE
+ */
+int is_np(struct task_struct *t);
+
+/* request that the task should call sys_exit_np()
+ */
+void request_exit_np(struct task_struct *t);
+
+#else
+
+static inline int is_np(struct task_struct *t)
+{
+        return tsk_rt(t)->kernel_np;
+}
+
+#define  request_exit_np(t)
+
+#endif
+
+
 #endif
diff --git a/litmus/litmus.c b/litmus/litmus.c
index 0dec4342ba..852559468d 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -316,6 +316,8 @@ void send_scheduler_signals(void)
 
 }
 
+#ifdef CONFIG_NP_SECTION
+
 static inline void np_mem_error(struct task_struct* t, const char* reason)
 {
         if (t->state != TASK_DEAD && !(t->flags & PF_EXITING)) {
@@ -455,6 +457,21 @@ asmlinkage long sys_exit_np(void)
         return retval;
 }
 
+#else /* !CONFIG_NP_SECTION */
+
+asmlinkage long sys_register_np_flag(short __user *flag)
+{
+        return -ENOSYS;
+}
+
+asmlinkage long sys_exit_np(void)
+{
+        return -ENOSYS;
+}
+
+#endif /* CONFIG_NP_SECTION */
+
+
 /* p is a real-time task. Re-init its state as a best-effort task. */
 static void reinit_litmus_state(struct task_struct* p, int restore)
 {