From d6a5d265d0d2c2e76780a141e2d11b4db659d655 Mon Sep 17 00:00:00 2001 From: Bang Nguyen Date: Tue, 19 Feb 2013 01:23:40 -0800 Subject: [PATCH] rds: scheduling while atomic on failover orabug: 16275095 Signed-off-by: Bang Nguyen (cherry picked from commit a1b048d2106086119400fccbf37129414edf3f3a) --- net/rds/ib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; -- 2.50.1