From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Thu, 1 Jul 2004 14:42:49 +0000 (+0000)
Subject: fixed so that kernel compiles when CKRM is not used
X-Git-Tag: before-ipod-patch~24
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=fd9edc319765a5d46604d0371494d8e65b71136c;p=linux-2.6.git

fixed so that kernel compiles when CKRM is not used
---

diff --git a/include/linux/ckrm.h b/include/linux/ckrm.h
index 99ab97e3a..4ac2c1894 100644
--- a/include/linux/ckrm.h
+++ b/include/linux/ckrm.h
@@ -120,6 +120,10 @@ static inline void ckrm_cb_##fct(void)  { }
 #define CKRM_DEF_CB_ARG(EV,fct,argtp)		\
 static inline void ckrm_cb_##fct(argtp arg) { }
 
+#define ckrm_cb_newtask(task_struct)
+#define ckrm_cb_exit(task_struct)
+#define ckrm_init()
+
 #endif // CONFIG_CKRM
 
 /*-----------------------------------------------------------------
@@ -143,6 +147,7 @@ CKRM_DEF_CB_ARG( USERDEL      , userdel,      struct user_struct *);
 CKRM_DEF_CB_ARG( LISTEN_START , listen_start, struct sock *       );
 CKRM_DEF_CB_ARG( LISTEN_STOP  , listen_stop,  struct sock *       );
 
+#ifdef CONFIG_CKRM
 // and a few special one's
 void ckrm_cb_newtask(struct task_struct *);
 void ckrm_cb_exit(struct task_struct *);
@@ -150,6 +155,7 @@ void ckrm_cb_exit(struct task_struct *);
 // some other functions required
 extern void ckrm_init(void);
 extern int get_exe_path_name(struct task_struct *, char *, int);
+#endif // CONFIG_CKRM
 
 #endif // __KERNEL__