From 4e5639d477c90779e31f9e04777a020d19229f08 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 30 Jul 2010 23:56:39 +0000
Subject: [PATCH] --- yaml --- r: 203959 b: refs/heads/master c:
 e2e0c7c9ddbe6b79fe647aca5eea3a405d38ada4 h: refs/heads/master i:   203957:
 7a4a05ec7e653564a4ac64080822d61e6767fe67   203955:
 9681061573cfd50f8241e0ff3df3a09c4e9529a1   203951:
 8296ebf6862e60fda3f1f0d30d4dc40e026ec1df v: v3

---
 [refs]                      | 2 +-
 trunk/net/rose/rose_route.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 45f37cccce03..d17b70caf5c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fc48c37ff3969dde71a43fa7c8f176d4bd90a3e
+refs/heads/master: e2e0c7c9ddbe6b79fe647aca5eea3a405d38ada4
diff --git a/trunk/net/rose/rose_route.c b/trunk/net/rose/rose_route.c
index cbc244a128bd..b4fdaac233f7 100644
--- a/trunk/net/rose/rose_route.c
+++ b/trunk/net/rose/rose_route.c
@@ -109,7 +109,9 @@ static int __must_check rose_add_node(struct rose_route_struct *rose_route,
 		init_timer(&rose_neigh->t0timer);
 
 		if (rose_route->ndigis != 0) {
-			if ((rose_neigh->digipeat = kmalloc(sizeof(ax25_digi), GFP_KERNEL)) == NULL) {
+			rose_neigh->digipeat =
+				kmalloc(sizeof(ax25_digi), GFP_ATOMIC);
+			if (rose_neigh->digipeat == NULL) {
 				kfree(rose_neigh);
 				res = -ENOMEM;
 				goto out;