git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
kernel
/
ckrm
/
rbce
/
rbcemod_ext.c
diff --git
a/kernel/ckrm/rbce/rbcemod_ext.c
b/kernel/ckrm/rbce/rbcemod_ext.c
index
3cae550
..
b0c6ee9
100644
(file)
--- a/
kernel/ckrm/rbce/rbcemod_ext.c
+++ b/
kernel/ckrm/rbce/rbcemod_ext.c
@@
-62,10
+62,10
@@
static int ukcc_fileop_notify(int rchan_id,
{
static int readers = 0;
if (fileop == RELAY_FILE_OPEN) {
{
static int readers = 0;
if (fileop == RELAY_FILE_OPEN) {
- // printk(
KERN_DEBUG
"got fileop_notify RELAY_FILE_OPEN for file %p\n",
+ // printk("got fileop_notify RELAY_FILE_OPEN for file %p\n",
// filp);
if (readers) {
// filp);
if (readers) {
- printk(
KERN_DEBUG
"only one client allowed, backoff .... \n");
+ printk("only one client allowed, backoff .... \n");
return -EPERM;
}
if (!try_module_get(THIS_MODULE))
return -EPERM;
}
if (!try_module_get(THIS_MODULE))
@@
-74,7
+74,7
@@
static int ukcc_fileop_notify(int rchan_id,
client_attached();
} else if (fileop == RELAY_FILE_CLOSE) {
client_attached();
} else if (fileop == RELAY_FILE_CLOSE) {
- // printk(
KERN_DEBUG
"got fileop_notify RELAY_FILE_CLOSE for file %p\n",
+ // printk("got fileop_notify RELAY_FILE_CLOSE for file %p\n",
// filp);
client_detached();
readers--;
// filp);
client_detached();
readers--;
@@
-109,10
+109,10
@@
static int create_ukcc_channel(void)
channel_flags,
&ukcc_callbacks, 0, 0, 0, 0, 0, 0, NULL, 0);
if (ukcc_channel < 0)
channel_flags,
&ukcc_callbacks, 0, 0, 0, 0, 0, 0, NULL, 0);
if (ukcc_channel < 0)
- printk(
KERN_DEBUG
"crbce: ukcc creation failed, errcode: %d\n",
+ printk("crbce: ukcc creation failed, errcode: %d\n",
ukcc_channel);
else
ukcc_channel);
else
- printk(
KERN_DEBUG
"crbce: ukcc created (%u KB)\n",
+ printk("crbce: ukcc created (%u KB)\n",
UKCC_TOTAL_BUFFER_SIZE >> 10);
return ukcc_channel;
}
UKCC_TOTAL_BUFFER_SIZE >> 10);
return ukcc_channel;
}
@@
-144,9
+144,9
@@
static inline void close_ukcc_channel(void)
(r),(l),-1,NULL) > 0); \
chan_state = chan_isok ? UKCC_OK : UKCC_STANDBY; \
if (chan_wasok && !chan_isok) { \
(r),(l),-1,NULL) > 0); \
chan_state = chan_isok ? UKCC_OK : UKCC_STANDBY; \
if (chan_wasok && !chan_isok) { \
- printk(
KERN_DEBUG "Channel stalled\n");
\
+ printk(
"Channel stalled\n");
\
} else if (!chan_wasok && chan_isok) { \
} else if (!chan_wasok && chan_isok) { \
- printk(
KERN_DEBUG "Channel continues\n");
\
+ printk(
"Channel continues\n");
\
} \
} while (0)
} \
} while (0)
@@
-288,7
+288,7
@@
send_task_record(struct task_struct *tsk, int event,
return 0;
pdata = RBCE_DATA(tsk);
if (pdata == NULL) {
return 0;
pdata = RBCE_DATA(tsk);
if (pdata == NULL) {
- // printk(
KERN_DEBUG
"send [%d]<%s>: no pdata\n",tsk->pid,tsk->comm);
+ // printk("send [%d]<%s>: no pdata\n",tsk->pid,tsk->comm);
return 0;
}
if (send_forced || (delta_mode == 0)
return 0;
}
if (send_forced || (delta_mode == 0)
@@
-384,7
+384,7
@@
static void send_task_data(void)
rec_set_timehdr(&limrec, CRBCE_REC_DATA_DELIMITER, 0, 0);
rec_send(&limrec);
rec_set_timehdr(&limrec, CRBCE_REC_DATA_DELIMITER, 0, 0);
rec_send(&limrec);
- // printk(
KERN_DEBUG
"send_task_data mode=%d t#=%d s#=%d\n",
+ // printk("send_task_data mode=%d t#=%d s#=%d\n",
// delta_mode,taskcnt,sendcnt);
}
// delta_mode,taskcnt,sendcnt);
}
@@
-503,7
+503,7
@@
static void sample_task_data(unsigned long unused)
}
while_each_thread(proc, thread);
read_unlock(&tasklist_lock);
}
while_each_thread(proc, thread);
read_unlock(&tasklist_lock);
-// printk(
KERN_DEBUG
"sample_timer: run=%d wait=%d\n",run,wait);
+// printk("sample_timer: run=%d wait=%d\n",run,wait);
start_sample_timer();
}
start_sample_timer();
}
@@
-513,7
+513,7
@@
static void ukcc_cmd_deliver(int rchan_id, char *from, u32 len)
struct crbce_cmd_done cmdret;
int rc = 0;
struct crbce_cmd_done cmdret;
int rc = 0;
-// printk(
KERN_DEBUG
"ukcc_cmd_deliver: %d %d len=%d:%d\n",cmdrec->type,
+// printk("ukcc_cmd_deliver: %d %d len=%d:%d\n",cmdrec->type,
// cmdrec->cmd,cmdrec->len,len);
cmdrec->len = len; // add this to reflection so the user doesn't
// cmdrec->cmd,cmdrec->len,len);
cmdrec->len = len; // add this to reflection so the user doesn't
@@
-578,20
+578,20
@@
static void ukcc_cmd_deliver(int rchan_id, char *from, u32 len)
cmdret.hdr.cmd = cmdrec->cmd;
cmdret.rc = rc;
rec_send(&cmdret);
cmdret.hdr.cmd = cmdrec->cmd;
cmdret.rc = rc;
rec_send(&cmdret);
-// printk(
KERN_DEBUG
"ukcc_cmd_deliver ACK: %d %d rc=%d %d\n",cmdret.hdr.type,
+// printk("ukcc_cmd_deliver ACK: %d %d rc=%d %d\n",cmdret.hdr.type,
// cmdret.hdr.cmd,rc,sizeof(cmdret));
}
static void client_attached(void)
{
// cmdret.hdr.cmd,rc,sizeof(cmdret));
}
static void client_attached(void)
{
- printk(
KERN_DEBUG
"client [%d]<%s> attached to UKCC\n", current->pid,
+ printk("client [%d]<%s> attached to UKCC\n", current->pid,
current->comm);
relay_reset(ukcc_channel);
}
static void client_detached(void)
{
current->comm);
relay_reset(ukcc_channel);
}
static void client_detached(void)
{
- printk(
KERN_DEBUG
"client [%d]<%s> detached to UKCC\n", current->pid,
+ printk("client [%d]<%s> detached to UKCC\n", current->pid,
current->comm);
chan_state = UKCC_STANDBY;
stop_sample_timer();
current->comm);
chan_state = UKCC_STANDBY;
stop_sample_timer();