Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[sfrench/cifs-2.6.git] / net / dccp / probe.c

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 146496fce2e2b4c6e40389ecbafc41b6a302ae97..3b1f509f51dd7000c474f420aa2ef0ebc75a08cc 100644 (file)
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -106,8 +106,10 @@ static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
 }
 
 static struct jprobe dccp_send_probe = {
-       .kp     = { .addr = (kprobe_opcode_t *)&dccp_sendmsg, },
-       .entry  = (kprobe_opcode_t *)&jdccp_sendmsg,
+       .kp     = {
+               .symbol_name = "dccp_sendmsg",
+       },
+       .entry  = JPROBE_ENTRY(jdccp_sendmsg),
 };
 
 static int dccpprobe_open(struct inode *inode, struct file *file)
@@ -147,7 +149,7 @@ out_free:
        return error ? error : cnt;
 }
 
-static struct file_operations dccpprobe_fops = {
+static const struct file_operations dccpprobe_fops = {
        .owner   = THIS_MODULE,
        .open    = dccpprobe_open,
        .read    = dccpprobe_read,
@@ -160,6 +162,8 @@ static __init int dccpprobe_init(void)
        init_waitqueue_head(&dccpw.wait);
        spin_lock_init(&dccpw.lock);
        dccpw.fifo = kfifo_alloc(bufsize, GFP_KERNEL, &dccpw.lock);
+       if (IS_ERR(dccpw.fifo))
+               return PTR_ERR(dccpw.fifo);
 
        if (!proc_net_fops_create(procname, S_IRUSR, &dccpprobe_fops))
                goto err0;