Message ID | 1365194488-23462-2-git-send-email-minipli@googlemail.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c index d28e7f0..2846cf5 100644 --- a/net/irda/af_irda.c +++ b/net/irda/af_irda.c @@ -1120,7 +1120,7 @@ static int irda_create(struct net *net, struct socket *sock, int protocol, } /* Allocate networking socket */ - sk = sk_alloc(net, PF_IRDA, GFP_ATOMIC, &irda_proto); + sk = sk_alloc(net, PF_IRDA, GFP_KERNEL, &irda_proto); if (sk == NULL) return -ENOMEM;
irda_create() is called from user context only, therefore has no need for GFP_ATOMIC. Signed-off-by: Mathias Krause <minipli@googlemail.com> --- net/irda/af_irda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)