From bf33ff12f8412fe63d8d7143a7b406043a278478 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Sun, 27 Jan 2008 10:29:20 -0800
Subject: [PATCH] --- yaml --- r: 80874 b: refs/heads/master c:
 404aae5d420ec543e2e8434f7ec0edf5e2d2b0c4 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 76fe094699ab..fddd06237ed3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4e886c29610f4374d8971ec7a248f011cc3bd73a
+refs/heads/master: 404aae5d420ec543e2e8434f7ec0edf5e2d2b0c4
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c b/trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
index 753588755fee..073afa7dd89a 100644
--- a/trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
+++ b/trunk/arch/x86/kernel/cpu/mcheck/mce_amd_64.c
@@ -450,7 +450,8 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu,
 	if (err)
 		goto out_free;
 
-	kobject_uevent(&b->kobj, KOBJ_ADD);
+	if (b)
+		kobject_uevent(&b->kobj, KOBJ_ADD);
 
 	return err;