From 67c7a0c290860391d5ab441776e1ca03e67e81bf Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Mon, 30 Nov 2009 15:38:19 -0500
Subject: [PATCH] --- yaml --- r: 169029 b: refs/heads/master c:
 cc9a2c8301683f73b7e0d1fc2cb5159110f3469f h: refs/heads/master i:   169027:
 b28d4091e879b89adc6b782834452a5b79afcacd v: v3

---
 [refs]                                | 2 +-
 trunk/arch/alpha/kernel/core_marvel.c | 2 ++
 trunk/arch/alpha/kernel/core_titan.c  | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a1837f005ed9..cd6163b2c466 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 04d8a9db89f00dee78d792d094dc573784ead643
+refs/heads/master: cc9a2c8301683f73b7e0d1fc2cb5159110f3469f
diff --git a/trunk/arch/alpha/kernel/core_marvel.c b/trunk/arch/alpha/kernel/core_marvel.c
index 8e059e58b0ac..53dd2f1a53aa 100644
--- a/trunk/arch/alpha/kernel/core_marvel.c
+++ b/trunk/arch/alpha/kernel/core_marvel.c
@@ -1103,6 +1103,8 @@ marvel_agp_info(void)
 	 * Allocate the info structure.
 	 */
 	agp = kmalloc(sizeof(*agp), GFP_KERNEL);
+	if (!agp)
+		return NULL;
 
 	/*
 	 * Fill it in.
diff --git a/trunk/arch/alpha/kernel/core_titan.c b/trunk/arch/alpha/kernel/core_titan.c
index 76686497b1e2..219bf271c0ba 100644
--- a/trunk/arch/alpha/kernel/core_titan.c
+++ b/trunk/arch/alpha/kernel/core_titan.c
@@ -757,6 +757,8 @@ titan_agp_info(void)
 	 * Allocate the info structure.
 	 */
 	agp = kmalloc(sizeof(*agp), GFP_KERNEL);
+	if (!agp)
+		return NULL;
 
 	/*
 	 * Fill it in.