aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2007-07-19 04:48:10 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-19 13:04:44 -0400
commit9e367d859297b9377d65574f538cf52730e9eda8 (patch)
treec7d4e7c3d1521810981d1623c5100a44600c603f /net
parent81eae375eceba481ca4c605d42913871f093f6d5 (diff)
jprobes: remove JPROBE_ENTRY()
AFAICT now that jprobe.entry is a void *, JPROBE_ENTRY doesn't do anything useful - so remove it .. I've left a do-nothing version so that out-of-tree jprobes code will still compile without modifications. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Cc: Prasanna S Panchamukhi <prasanna@in.ibm.com> Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Cc: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/dccp/probe.c2
-rw-r--r--net/ipv4/tcp_probe.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 43a3adb027e7..bae10b0f2fc3 100644
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -112,7 +112,7 @@ static struct jprobe dccp_send_probe = {
112 .kp = { 112 .kp = {
113 .symbol_name = "dccp_sendmsg", 113 .symbol_name = "dccp_sendmsg",
114 }, 114 },
115 .entry = JPROBE_ENTRY(jdccp_sendmsg), 115 .entry = jdccp_sendmsg,
116}; 116};
117 117
118static int dccpprobe_open(struct inode *inode, struct file *file) 118static int dccpprobe_open(struct inode *inode, struct file *file)
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index f37d5928921a..b76398d1b454 100644
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
@@ -130,7 +130,7 @@ static struct jprobe tcp_jprobe = {
130 .kp = { 130 .kp = {
131 .symbol_name = "tcp_rcv_established", 131 .symbol_name = "tcp_rcv_established",
132 }, 132 },
133 .entry = JPROBE_ENTRY(jtcp_rcv_established), 133 .entry = jtcp_rcv_established,
134}; 134};
135 135
136static int tcpprobe_open(struct inode * inode, struct file * file) 136static int tcpprobe_open(struct inode * inode, struct file * file)