Commit-ID: 74b602c7147212a7495879ec23fe6c2d3b470e06
Gitweb: http://git.kernel.org/tip/74b602c7147212a7495879ec23fe6c2d3b470e06
Author: Yinghai Lu <yinghai@xxxxxxxxxx>
AuthorDate: Wed, 17 Jun 2009 14:43:32 -0700
Committer: H. Peter Anvin <hpa@xxxxxxxxx>
CommitDate: Wed, 17 Jun 2009 21:43:16 -0700
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@xxxxxxxxxx>
Acked-by: Hidetoshi Seto <seto.hidetoshi@xxxxxxxxxxxxxx>
Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
---
arch/x86/kernel/cpu/mcheck/mce.c | 2 +-
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 2a560ce..5aac9e4 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
};
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|