---

yaml --- r: 199873 b: refs/heads/master c: 0375fc4 h: refs/heads/master i: 199871: 44b63ba v: v3
git-mirror · Jun 4, 2010 · 7d09719 · 7d09719
1 parent 9de89bd
commit 7d09719
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;