diff --git a/[refs] b/[refs]
index 341b481df9b3..7d77469a83d7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6aa8b04975e71fb3d67bec7fbe2995b9bf54a06e
+refs/heads/master: af3b162afd9fce69a94d79bd5b1f9c7c302212f4
diff --git a/trunk/drivers/net/pppol2tp.c b/trunk/drivers/net/pppol2tp.c
index f87176055d0e..266e8b38fe10 100644
--- a/trunk/drivers/net/pppol2tp.c
+++ b/trunk/drivers/net/pppol2tp.c
@@ -2054,7 +2054,7 @@ static int pppol2tp_setsockopt(struct socket *sock, int level, int optname,
  */
 static int pppol2tp_tunnel_getsockopt(struct sock *sk,
 				      struct pppol2tp_tunnel *tunnel,
-				      int optname, int __user *val)
+				      int optname, int *val)
 {
 	int err = 0;
 
@@ -2077,7 +2077,7 @@ static int pppol2tp_tunnel_getsockopt(struct sock *sk,
  */
 static int pppol2tp_session_getsockopt(struct sock *sk,
 				       struct pppol2tp_session *session,
-				       int optname, int __user *val)
+				       int optname, int *val)
 {
 	int err = 0;