From 94ca9808c665fe11f4060b9f5b5badbacbc865ed Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Sun, 6 May 2007 14:50:39 -0700
Subject: [PATCH] --- yaml --- r: 54258 b: refs/heads/master c:
 2af0bc94a665f22975de11bddcf6c57907ce8255 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/alpha/kernel/srmcons.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d394ebd7b038..fcb2386ff588 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed58a593dcf6bb9853f711e56f8618f84b7b8cb2
+refs/heads/master: 2af0bc94a665f22975de11bddcf6c57907ce8255
diff --git a/trunk/arch/alpha/kernel/srmcons.c b/trunk/arch/alpha/kernel/srmcons.c
index 756923203860..85a821aaceb4 100644
--- a/trunk/arch/alpha/kernel/srmcons.c
+++ b/trunk/arch/alpha/kernel/srmcons.c
@@ -164,9 +164,9 @@ srmcons_get_private_struct(struct srmcons_private **ps)
 	int retval = 0;
 
 	if (srmconsp == NULL) {
+		srmconsp = kmalloc(sizeof(*srmconsp), GFP_KERNEL);
 		spin_lock_irqsave(&srmconsp_lock, flags);
 
-		srmconsp = kmalloc(sizeof(*srmconsp), GFP_KERNEL);
 		if (srmconsp == NULL)
 			retval = -ENOMEM;
 		else {