From: Bang Nguyen <band.nguyen@oracle.com>
Date: Tue, 19 Feb 2013 09:23:40 +0000 (-0800)
Subject: rds: scheduling while atomic on failover orabug: 16275095
X-Git-Tag: v4.1.12-92~293^2^2~74
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d6a5d265d0d2c2e76780a141e2d11b4db659d655;p=users%2Fjedix%2Flinux-maple.git

rds: scheduling while atomic on failover orabug: 16275095

Signed-off-by: Bang Nguyen <band.nguyen@oracle.com>
(cherry picked from commit a1b048d2106086119400fccbf37129414edf3f3a)
---

diff --git a/net/rds/ib.c b/net/rds/ib.c
index 9baaa8c8ecc0..3c26e282750c 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -891,7 +891,7 @@ static void rds_ib_event_handler(struct ib_event_handler *handler,
 			(event->event == IB_EVENT_PORT_ACTIVE) ?
 				"ACTIVE" : "ERROR");
 
-		work = kzalloc(sizeof *work, GFP_KERNEL);
+		work = kzalloc(sizeof *work, GFP_ATOMIC);
 		if (!work) {
 			printk(KERN_ERR
 				"RDS/IB: failed to allocate port work\n");
@@ -1238,7 +1238,7 @@ static int rds_ib_netdev_callback(struct notifier_block *self, unsigned long eve
 		ip_config[port].port_num, ndev->name,
 		(event == NETDEV_UP) ? "UP" : "DOWN");
 
-	work = kzalloc(sizeof *work, GFP_KERNEL);
+	work = kzalloc(sizeof *work, GFP_ATOMIC);
 	if (!work) {
 		printk(KERN_ERR "RDS/IB: failed to allocate port work\n");
 		return NOTIFY_DONE;