From: Yinghai Lu <yinghai@kernel.org>
Date: Wed, 17 Jun 2009 21:43:32 +0000 (-0700)
Subject: x86: fix duplicated sysfs attribute
X-Git-Tag: v2.6.31-rc1~97^2^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=74b602c7147212a7495879ec23fe6c2d3b470e06;p=karo-tx-linux.git

x86: fix duplicated sysfs attribute

The sysfs attribute cmci_disabled was accidentall turned into a
duplicate of ignore_ce, breaking all other attributes.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 2a560cefb675..5aac9e4dd136 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1777,7 +1777,7 @@ static struct sysdev_ext_attribute attr_ignore_ce = {
 };
 
 static struct sysdev_ext_attribute attr_cmci_disabled = {
-	_SYSDEV_ATTR(ignore_ce, 0644, sysdev_show_int, set_cmci_disabled),
+	_SYSDEV_ATTR(cmci_disabled, 0644, sysdev_show_int, set_cmci_disabled),
 	&mce_cmci_disabled
 };