2 files changed, 5 insertions, 11 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 29e87d3b2843..46cbf8689692 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -2209,11 +2209,6 @@ static struct dev_ext_attribute dev_attr_cmci_disabled = {
         &mce_cmci_disabled
 };
 
-static struct dev_ext_attribute dev_attr_bios_cmci_threshold = {
-        __ATTR(bios_cmci_threshold, 0444, device_show_int, NULL),
-        &mce_bios_cmci_threshold
-};
-
 static struct device_attribute *mce_device_attrs[] = {
         &dev_attr_tolerant.attr,
         &dev_attr_check_interval.attr,
@@ -2222,7 +2217,6 @@ static struct device_attribute *mce_device_attrs[] = {
         &dev_attr_dont_log_ce.attr,
         &dev_attr_ignore_ce.attr,
         &dev_attr_cmci_disabled.attr,
-        &dev_attr_bios_cmci_threshold.attr,
         NULL
 };
 
diff --git a/arch/x86/kernel/cpu/mcheck/mce_amd.c b/arch/x86/kernel/cpu/mcheck/mce_amd.c
index c4e916d77378..698b6ec12e0f 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_amd.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_amd.c
@@ -576,12 +576,10 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
         int err = 0;
 
         if (shared_bank[bank]) {
-
                 nb = node_to_amd_nb(amd_get_nb_id(cpu));
-                WARN_ON(!nb);
 
                 /* threshold descriptor already initialized on this node? */
-                if (nb->bank4) {
+                if (nb && nb->bank4) {
                         /* yes, use it */
                         b = nb->bank4;
                         err = kobject_add(b->kobj, &dev->kobj, name);
@@ -615,8 +613,10 @@ static __cpuinit int threshold_create_bank(unsigned int cpu, unsigned int bank)
                 atomic_set(&b->cpus, 1);
 
                 /* nb is already initialized, see above */
-                WARN_ON(nb->bank4);
-                nb->bank4 = b;
+                if (nb) {
+                        WARN_ON(nb->bank4);
+                        nb->bank4 = b;
+                }
         }
 
         err = allocate_threshold_blocks(cpu, bank, 0,