From 7d09719e7fd16510dd278e841b35249c65c1a843 Mon Sep 17 00:00:00 2001
From: Sven Eckelmann <sven.eckelmann@gmx.de>
Date: Sat, 22 May 2010 17:48:47 +0200
Subject: [PATCH] --- yaml --- r: 199873 b: refs/heads/master c:
 0375fc4d2748b7c7064d481b36e32ef19e43d8db h: refs/heads/master i:   199871:
 44b63ba91f6e63e37c57d6f404823cee49e17dc9 v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/batman-adv/device.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ac6623bf532a..1ef0ff772742 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3d9b2358930a3e5225b28ac1458236f3d667e368
+refs/heads/master: 0375fc4d2748b7c7064d481b36e32ef19e43d8db
diff --git a/trunk/drivers/staging/batman-adv/device.c b/trunk/drivers/staging/batman-adv/device.c
index ad82ec4a4856..7eb6559e0315 100644
--- a/trunk/drivers/staging/batman-adv/device.c
+++ b/trunk/drivers/staging/batman-adv/device.c
@@ -309,7 +309,7 @@ void bat_device_add_packet(struct device_client *device_client,
 	struct device_packet *device_packet;
 	unsigned long flags;
 
-	device_packet = kmalloc(sizeof(struct device_packet), GFP_KERNEL);
+	device_packet = kmalloc(sizeof(struct device_packet), GFP_ATOMIC);
 
 	if (!device_packet)
 		return;