Merge tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / net / xfrm / xfrm_user.c

diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 805681a7d356a7f4984f5dcd30c666291d3ae59a..2cc7af858c6f2a599aac11926d018d937622b236 100644 (file)
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -2449,7 +2449,7 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
        int type, err;
 
 #ifdef CONFIG_COMPAT
-       if (is_compat_task())
+       if (in_compat_syscall())
                return -ENOTSUPP;
 #endif