Merge branch 'master' into csb1725

[mv-sheeva.git] / net / sctp / probe.c

diff --git a/net/sctp/probe.c b/net/sctp/probe.c
index db3a42b8b34962594b7c8fe3e38b45cb68b19f83..bc6cd75cc1dcdc82792b7056ce2b1566bbb945d5 100644 (file)
--- a/net/sctp/probe.c
+++ b/net/sctp/probe.c
@@ -22,6 +22,8 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/kernel.h>
 #include <linux/kprobes.h>
 #include <linux/socket.h>
@@ -117,6 +119,7 @@ static const struct file_operations sctpprobe_fops = {
        .owner  = THIS_MODULE,
        .open   = sctpprobe_open,
        .read   = sctpprobe_read,
+       .llseek = noop_llseek,
 };
 
 sctp_disposition_t jsctp_sf_eat_sack(const struct sctp_endpoint *ep,
@@ -192,7 +195,7 @@ static __init int sctpprobe_init(void)
        if (ret)
                goto remove_proc;
 
-       pr_info("SCTP probe registered (port=%d)\n", port);
+       pr_info("probe registered (port=%d)\n", port);
 
        return 0;