From 316a30a31c5de3c6970e1a33672aa64a977d7264 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@cmpxchg.org>
Date: Fri, 13 Feb 2009 04:38:04 +0100
Subject: [PATCH] --- yaml --- r: 135766 b: refs/heads/master c:
 0e43785c57fee50fbc00ea0378e941efb61fa0c2 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/kernel/irq/manage.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 56850eca3c4d..af4021f32893 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 74296a8ed6aa3c5bf672808ada690de7ba323ecc
+refs/heads/master: 0e43785c57fee50fbc00ea0378e941efb61fa0c2
diff --git a/trunk/kernel/irq/manage.c b/trunk/kernel/irq/manage.c
index cd0cd8dcb345..1c5055069170 100644
--- a/trunk/kernel/irq/manage.c
+++ b/trunk/kernel/irq/manage.c
@@ -717,7 +717,7 @@ int request_irq(unsigned int irq, irq_handler_t handler,
 	if (!handler)
 		return -EINVAL;
 
-	action = kmalloc(sizeof(struct irqaction), GFP_ATOMIC);
+	action = kmalloc(sizeof(struct irqaction), GFP_KERNEL);
 	if (!action)
 		return -ENOMEM;