summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorYinghai Lu <yinghai@kernel.org>2009-06-17 14:43:32 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-06-17 21:43:16 -0700
commit74b602c7147212a7495879ec23fe6c2d3b470e06 (patch)
tree70c98b21f57de109dee9b85b14c53adcbcc30389 /arch/x86/kernel
parent813400060fe2824163cabd9afed4e476e7ce282e (diff)
downloadkernel-crypto-74b602c7147212a7495879ec23fe6c2d3b470e06.tar.gz
kernel-crypto-74b602c7147212a7495879ec23fe6c2d3b470e06.tar.xz
kernel-crypto-74b602c7147212a7495879ec23fe6c2d3b470e06.zip
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>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/cpu/mcheck/mce.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 2a560cefb67..5aac9e4dd13 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
};