2009-12-08 07:53:02

by Hidetoshi Seto

Subject: [PATCH] x86, mce: fix wrong change in mce_create_device

commit cebe182033f156b430952370fb0f9dbe6e89b081 had an unnecessary,
wrong change. Fix it.

Signed-off-by: Hidetoshi Seto <[email protected]>
---
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 a96e5cd..a8aacd4 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1929,7 +1929,7 @@ error2:
sysdev_remove_file(&per_cpu(mce_dev, cpu), &mce_banks[j].attr);
error:
while (--i >= 0)
- sysdev_remove_file(&per_cpu(mce_dev, cpu), &mce_banks[i].attr);
+ sysdev_remove_file(&per_cpu(mce_dev, cpu), mce_attrs[i]);

sysdev_unregister(&per_cpu(mce_dev, cpu));

--
1.6.5.5

2009-12-08 20:13:16

by Hidetoshi Seto

Subject: [tip:x86/urgent] x86, mce: fix confusion between bank attributes and mce attributes

Commit-ID: 5c0e9f28da84c68ce0ae68b7a75faaf862e156e2
Gitweb: http://git.kernel.org/tip/5c0e9f28da84c68ce0ae68b7a75faaf862e156e2
Author: Hidetoshi Seto <[email protected]>
AuthorDate: Tue, 8 Dec 2009 16:52:44 +0900
Committer: H. Peter Anvin <[email protected]>
CommitDate: Tue, 8 Dec 2009 12:11:20 -0800

x86, mce: fix confusion between bank attributes and mce attributes

Commit cebe182033f156b430952370fb0f9dbe6e89b081 had an unnecessary,
wrong change: &mce_banks[i].attr is equivalent to the former
bank_attrs[i], not to mce_attrs[i].

Signed-off-by: Hidetoshi Seto <[email protected]>
Acked-by: Andi Kleen <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
---
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 a96e5cd..a8aacd4 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -1929,7 +1929,7 @@ error2:
sysdev_remove_file(&per_cpu(mce_dev, cpu), &mce_banks[j].attr);
error:
while (--i >= 0)
- sysdev_remove_file(&per_cpu(mce_dev, cpu), &mce_banks[i].attr);
+ sysdev_remove_file(&per_cpu(mce_dev, cpu), mce_attrs[i]);

sysdev_unregister(&per_cpu(mce_dev, cpu));